From 1b0f5e1bbf476fd319ec967c9aa51cea36c74629 Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Wed, 21 Oct 2020 15:41:02 +0100
Subject: [PATCH] updated
trying to sort out router ios issue
trying to make device name storage more persistent to support quicker movement between microcosms.
---
.DS_Store | Bin 10244 -> 10244 bytes
CHANGELOG.md | 8 +
app/package-lock.json | 290 +++++++++++------------
app/package.json | 11 +-
app/src/components/Navigation.vue | 6 +-
app/src/components/OnBoard.vue | 25 +-
app/src/components/old/ControlsLayer.vue | 2 +-
app/src/experimental/ModeToolbar.vue | 5 +-
app/src/router/index.js | 6 -
app/src/views/Cards.vue | 6 +-
app/src/views/Discarded.vue | 5 +
app/src/views/Leave.vue | 2 +-
app/src/views/List.vue | 7 +-
13 files changed, 194 insertions(+), 179 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 6137b508b72f63d6028b7a92f6de04ef9f5a57e0..63510f15264f0c19ae44d699b9e61dfc53c2918b 100644
GIT binary patch
delta 21
ccmZn(XbISGMu5Y@(ojdi#Kdg#6#)Zr08pX^rvLx|
delta 21
ccmZn(XbISGMu5ZI(o#pk%+O@>6#)Zr08rcps{jB1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfc05b5..0a1cad2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 0.1.29
+
+_16th October 2020_
+
+### Changed
+
+- name is now stored unless cleared meaning you can switch microcosms faster on any device
+
# 0.1.28
_10th October 2020_
diff --git a/app/package-lock.json b/app/package-lock.json
index 5b4190c..f7b2699 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -25,16 +25,16 @@
"dev": true
},
"@babel/core": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.1.tgz",
- "integrity": "sha512-6bGmltqzIJrinwRRdczQsMhruSi9Sqty9Te+/5hudn4Izx/JYRhW1QELpR+CIL0gC/c9A7WroH6FmkDGxmWx3w==",
+ "version": "7.12.3",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz",
+ "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.10.4",
"@babel/generator": "^7.12.1",
"@babel/helper-module-transforms": "^7.12.1",
"@babel/helpers": "^7.12.1",
- "@babel/parser": "^7.12.1",
+ "@babel/parser": "^7.12.3",
"@babel/template": "^7.10.4",
"@babel/traverse": "^7.12.1",
"@babel/types": "^7.12.1",
@@ -69,9 +69,9 @@
}
},
"@babel/parser": {
- "version": "7.12.2",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.2.tgz",
- "integrity": "sha512-LMN+SqTiZEonUw4hQA0A3zG8DnN0E1F4K107LbDDUnC+0chML1rvWgsHloC9weB4RmZweE0uhFq0eGX7Nr/PBQ==",
+ "version": "7.12.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
+ "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==",
"dev": true
},
"@babel/types": {
@@ -428,9 +428,9 @@
"dev": true
},
"@babel/helper-wrap-function": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
- "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+ "version": "7.12.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+ "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
"dev": true,
"requires": {
"@babel/helper-function-name": "^7.10.4",
@@ -1256,9 +1256,9 @@
}
},
"@babel/parser": {
- "version": "7.12.2",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.2.tgz",
- "integrity": "sha512-LMN+SqTiZEonUw4hQA0A3zG8DnN0E1F4K107LbDDUnC+0chML1rvWgsHloC9weB4RmZweE0uhFq0eGX7Nr/PBQ==",
+ "version": "7.12.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
+ "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==",
"dev": true
},
"@babel/types": {
@@ -2625,13 +2625,13 @@
}
},
"@types/serve-static": {
- "version": "1.13.5",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz",
- "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==",
+ "version": "1.13.6",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.6.tgz",
+ "integrity": "sha512-nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==",
"dev": true,
"requires": {
- "@types/express-serve-static-core": "*",
- "@types/mime": "*"
+ "@types/mime": "*",
+ "@types/node": "*"
}
},
"@types/source-list-map": {
@@ -2664,9 +2664,9 @@
}
},
"@types/webpack": {
- "version": "4.41.22",
- "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz",
- "integrity": "sha512-JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==",
+ "version": "4.41.23",
+ "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.23.tgz",
+ "integrity": "sha512-ojA4CupZg8RCzVJLugWlvqrHpT59GWhqFxbinlsnvk10MjQCWB+ot7XDACctbWhnhtdhYK7+HOH1JxkVLiZhMg==",
"dev": true,
"requires": {
"@types/anymatch": "*",
@@ -2718,9 +2718,9 @@
}
},
"@vue/babel-helper-vue-jsx-merge-props": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
- "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
+ "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==",
"dev": true
},
"@vue/babel-helper-vue-transform-on": {
@@ -2754,14 +2754,14 @@
}
},
"@vue/babel-plugin-transform-vue-jsx": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz",
- "integrity": "sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz",
+ "integrity": "sha512-HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA==",
"dev": true,
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@babel/plugin-syntax-jsx": "^7.2.0",
- "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+ "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
"html-tags": "^2.0.0",
"lodash.kebabcase": "^4.1.1",
"svg-tags": "^1.0.0"
@@ -2776,9 +2776,9 @@
}
},
"@vue/babel-preset-app": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.5.7.tgz",
- "integrity": "sha512-A9ujqmvR9wb8nWiMnEYZW/8QfGZbqxC/etzbKIDrUdsqJ27jx106leMHJc8nmAn58RqGd6iww6uZ3Sx7aYiG3A==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.5.8.tgz",
+ "integrity": "sha512-efCBo2HY8Jcs6+SyCnvWl8jGeF1Fl38reFL35AjO4SBcro0ol/qjPkeeJLjzvXUxrHAsM9DMfL/DvPa/hBmZwQ==",
"dev": true,
"requires": {
"@babel/core": "^7.11.0",
@@ -2808,46 +2808,66 @@
}
},
"@vue/babel-preset-jsx": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz",
- "integrity": "sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.3.tgz",
+ "integrity": "sha512-yMPoPFH6kiNFAhJknjLKAre7JQNWRPjH1K9EyzTPi/J5T5oDC8sEumSjWI6lBQxcSaBboXpQp92mvxZdXCfiFw==",
+ "dev": true,
+ "requires": {
+ "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+ "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
+ "@vue/babel-sugar-composition-api-inject-h": "^1.2.1",
+ "@vue/babel-sugar-composition-api-render-instance": "^1.2.1",
+ "@vue/babel-sugar-functional-vue": "^1.2.2",
+ "@vue/babel-sugar-inject-h": "^1.2.2",
+ "@vue/babel-sugar-v-model": "^1.2.3",
+ "@vue/babel-sugar-v-on": "^1.2.3"
+ }
+ },
+ "@vue/babel-sugar-composition-api-inject-h": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz",
+ "integrity": "sha512-4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ==",
+ "dev": true,
+ "requires": {
+ "@babel/plugin-syntax-jsx": "^7.2.0"
+ }
+ },
+ "@vue/babel-sugar-composition-api-render-instance": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.1.tgz",
+ "integrity": "sha512-F2gQbEMOUPyapqc85/O1Tbw0qBuvgXC/qBcBsjMKqC7KWJ4hK1eJUvU3iLHHTbre6V7zzIjrqEe0SoE1lR4mfw==",
"dev": true,
"requires": {
- "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
- "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
- "@vue/babel-sugar-functional-vue": "^1.1.2",
- "@vue/babel-sugar-inject-h": "^1.1.2",
- "@vue/babel-sugar-v-model": "^1.1.2",
- "@vue/babel-sugar-v-on": "^1.1.2"
+ "@babel/plugin-syntax-jsx": "^7.2.0"
}
},
"@vue/babel-sugar-functional-vue": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz",
- "integrity": "sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz",
+ "integrity": "sha512-JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w==",
"dev": true,
"requires": {
"@babel/plugin-syntax-jsx": "^7.2.0"
}
},
"@vue/babel-sugar-inject-h": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz",
- "integrity": "sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz",
+ "integrity": "sha512-y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw==",
"dev": true,
"requires": {
"@babel/plugin-syntax-jsx": "^7.2.0"
}
},
"@vue/babel-sugar-v-model": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz",
- "integrity": "sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.3.tgz",
+ "integrity": "sha512-A2jxx87mySr/ulAsSSyYE8un6SIH0NWHiLaCWpodPCVOlQVODCaSpiR4+IMsmBr73haG+oeCuSvMOM+ttWUqRQ==",
"dev": true,
"requires": {
"@babel/plugin-syntax-jsx": "^7.2.0",
- "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
- "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+ "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+ "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
"camelcase": "^5.0.0",
"html-tags": "^2.0.0",
"svg-tags": "^1.0.0"
@@ -2862,31 +2882,31 @@
}
},
"@vue/babel-sugar-v-on": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz",
- "integrity": "sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.3.tgz",
+ "integrity": "sha512-kt12VJdz/37D3N3eglBywV8GStKNUhNrsxChXIV+o0MwVXORYuhDTHJRKPgLJRb/EY3vM2aRFQdxJBp9CLikjw==",
"dev": true,
"requires": {
"@babel/plugin-syntax-jsx": "^7.2.0",
- "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+ "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
"camelcase": "^5.0.0"
}
},
"@vue/cli-overlay": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.7.tgz",
- "integrity": "sha512-45BbVPR2dTa27QGaFap7eNYbJSzuIhGff1R5L50tWlpw/lf8fIyOuXSdSNQGZCVe+Y3NbcD2DK7mZryxOXWGmw==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.8.tgz",
+ "integrity": "sha512-M6q4QPKQfErHk54ycxBASgBadgdsK45f6v2NWUTAiFXdTtqv1Z7gR8JAbQhiXbni/m9571bLJnZFv5c8uhAHnw==",
"dev": true
},
"@vue/cli-plugin-babel": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.7.tgz",
- "integrity": "sha512-cqtHoXWHxtMj8qyN0A2TvFRuEQsqtDlYeKaOT1XDwbfHZwWXlD4BBsqXZBnqQkQI0hijMOA0QOnqA63/x0lpMg==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.8.tgz",
+ "integrity": "sha512-2quuLuCZq2vH29xfp66L5YfUxQvyMX9te5jMslfQGVzvUmFpPbz8ceioZYW9+VqWjg8pzqSuBE+ANJLWdy2RtQ==",
"dev": true,
"requires": {
"@babel/core": "^7.11.0",
- "@vue/babel-preset-app": "^4.5.7",
- "@vue/cli-shared-utils": "^4.5.7",
+ "@vue/babel-preset-app": "^4.5.8",
+ "@vue/cli-shared-utils": "^4.5.8",
"babel-loader": "^8.1.0",
"cache-loader": "^4.1.0",
"thread-loader": "^2.1.3",
@@ -2894,12 +2914,12 @@
}
},
"@vue/cli-plugin-eslint": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.7.tgz",
- "integrity": "sha512-6fWob1xh2W0uif2++YhNiBWITDBsAEktdgnLRgIgM/UqUg9oFpz9tqs0i85PQwjUDIn/erMT2ID3hnOncYTxxQ==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.8.tgz",
+ "integrity": "sha512-1lg3K2D/harXbN4FvRoA1b0X9947H+G4Ql/43rxJY39OqswfK/d1ck438Fo9M4l1+zhBSUNDmcjn7Q2EH6qWmA==",
"dev": true,
"requires": {
- "@vue/cli-shared-utils": "^4.5.7",
+ "@vue/cli-shared-utils": "^4.5.8",
"eslint-loader": "^2.2.1",
"globby": "^9.2.0",
"inquirer": "^7.1.0",
@@ -2908,24 +2928,24 @@
}
},
"@vue/cli-plugin-router": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.7.tgz",
- "integrity": "sha512-wzKz8+qOXNqVglcw90lYHbu5UJQo8QoyNXHAiM0RIX4r3W8KqiHrvu7MZFCOVKM3ojRFbDofumorypN2yieSXA==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.8.tgz",
+ "integrity": "sha512-tJwVLdX4jj0Ia/1hsBejRbo4gs0hb2z1z5ert+4Ve5RNdpOKUG69OaPQgXPqvuYSQh9MW7bqG0iJmYtVD+KBNw==",
"dev": true,
"requires": {
- "@vue/cli-shared-utils": "^4.5.7"
+ "@vue/cli-shared-utils": "^4.5.8"
}
},
"@vue/cli-plugin-vuex": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.7.tgz",
- "integrity": "sha512-bHH2JSAd/S9fABtZdr3xVSgbIPm3PGcan56adMt0hGlm6HG/QxDNuPLppMleuBLr9uHoHX5x7sQmbtZvzIYjxw==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.8.tgz",
+ "integrity": "sha512-wU9WPhay1zBxtdd/HLRYhFRLBbG9lw3YTBJep9sTnYwUeXiEgum4O88Q2j6cwBBPPHMgeMrKMPHS85Jf4hMc0g==",
"dev": true
},
"@vue/cli-service": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.7.tgz",
- "integrity": "sha512-iT5wb5JbF/kbJCY7HR8qabWEiaMvZP4/KPezsnEp/6vNGAF0Akx0FGvCuU9sm7uf6w0UKzIJ38I6JJBtkOMvJA==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.8.tgz",
+ "integrity": "sha512-YcVEJvA5vQOcfRzhCQDfHxRW9WHvKqlQeiuSvNddfV2uQqKD3ifhsNYiZZuFvbev9qgRUmtmxSafpwYzj/LLBw==",
"dev": true,
"requires": {
"@intervolga/optimize-cssnano-plugin": "^1.0.5",
@@ -2934,10 +2954,10 @@
"@types/minimist": "^1.2.0",
"@types/webpack": "^4.0.0",
"@types/webpack-dev-server": "^3.11.0",
- "@vue/cli-overlay": "^4.5.7",
- "@vue/cli-plugin-router": "^4.5.7",
- "@vue/cli-plugin-vuex": "^4.5.7",
- "@vue/cli-shared-utils": "^4.5.7",
+ "@vue/cli-overlay": "^4.5.8",
+ "@vue/cli-plugin-router": "^4.5.8",
+ "@vue/cli-plugin-vuex": "^4.5.8",
+ "@vue/cli-shared-utils": "^4.5.8",
"@vue/component-compiler-utils": "^3.1.2",
"@vue/preload-webpack-plugin": "^1.1.0",
"@vue/web-component-wrapper": "^1.2.0",
@@ -3107,9 +3127,9 @@
}
},
"@vue/cli-shared-utils": {
- "version": "4.5.7",
- "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.7.tgz",
- "integrity": "sha512-oicFfx9PvgupxN/LW0s2ktdn1U6bBu8J4lPcW2xj6TtTWUkkxwzis4Tm+XOvgvZnu44+d7216y0Y4TX90q645w==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.8.tgz",
+ "integrity": "sha512-pa6oenhBO/5HeDLRSokiwVN01gROACEDy3ESXWuPmragOREGNmmFKtkPHlqeYavGEX6LFp7f0VK3uMX6UYS5mQ==",
"dev": true,
"requires": {
"@hapi/joi": "^15.0.1",
@@ -4771,9 +4791,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001148",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz",
- "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==",
+ "version": "1.0.30001150",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001150.tgz",
+ "integrity": "sha512-kiNKvihW0m36UhAFnl7bOAv0i1K1f6wpfVtTF5O5O82XzgtBnb05V0XeV3oZ968vfg2sRNChsHw8ASH2hDfoYQ==",
"dev": true
},
"case-sensitive-paths-webpack-plugin": {
@@ -6694,9 +6714,9 @@
}
},
"entities": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
- "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+ "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
"dev": true
},
"err-code": {
@@ -10666,9 +10686,9 @@
}
},
"it-to-buffer": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/it-to-buffer/-/it-to-buffer-1.0.2.tgz",
- "integrity": "sha512-mTuceNC6deSbANZSQFxNRwFlVPvIZkjzxX10mOBxgzzhBGOkih2+OkOyGbhhcGNu/jxd4hk8qkjjOipx+tNIGA==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/it-to-buffer/-/it-to-buffer-1.0.4.tgz",
+ "integrity": "sha512-wycpGeAdQ8WH8eSBkMHN/HMNiQ0Y88XEXo6s6LGJbQZjf9K7ppVzUfCXn7OnxFfUPN0HTWZr+uhthwtrwMTTfw==",
"requires": {
"buffer": "^5.5.0"
}
@@ -12952,9 +12972,9 @@
}
},
"node-releases": {
- "version": "1.1.63",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz",
- "integrity": "sha512-ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg==",
+ "version": "1.1.64",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz",
+ "integrity": "sha512-Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==",
"dev": true
},
"nofilter": {
@@ -14673,13 +14693,13 @@
"integrity": "sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="
},
"pretty-error": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
- "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+ "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
"dev": true,
"requires": {
- "renderkid": "^2.0.1",
- "utila": "~0.4"
+ "lodash": "^4.17.20",
+ "renderkid": "^2.0.4"
}
},
"process": {
@@ -15218,16 +15238,16 @@
"dev": true
},
"renderkid": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
- "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz",
+ "integrity": "sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==",
"dev": true,
"requires": {
"css-select": "^1.1.0",
"dom-converter": "^0.2",
"htmlparser2": "^3.3.0",
- "strip-ansi": "^3.0.0",
- "utila": "^0.4.0"
+ "lodash": "^4.17.20",
+ "strip-ansi": "^3.0.0"
},
"dependencies": {
"ansi-regex": {
@@ -16498,65 +16518,23 @@
}
},
"string.prototype.trimend": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
- "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+ "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "es-abstract": "^1.17.5"
- },
- "dependencies": {
- "es-abstract": {
- "version": "1.17.7",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
- "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
- "dev": true,
- "requires": {
- "es-to-primitive": "^1.2.1",
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-symbols": "^1.0.1",
- "is-callable": "^1.2.2",
- "is-regex": "^1.1.1",
- "object-inspect": "^1.8.0",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.1",
- "string.prototype.trimend": "^1.0.1",
- "string.prototype.trimstart": "^1.0.1"
- }
- }
+ "es-abstract": "^1.18.0-next.1"
}
},
"string.prototype.trimstart": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
- "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+ "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "es-abstract": "^1.17.5"
- },
- "dependencies": {
- "es-abstract": {
- "version": "1.17.7",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
- "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
- "dev": true,
- "requires": {
- "es-to-primitive": "^1.2.1",
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-symbols": "^1.0.1",
- "is-callable": "^1.2.2",
- "is-regex": "^1.1.1",
- "object-inspect": "^1.8.0",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.1",
- "string.prototype.trimend": "^1.0.1",
- "string.prototype.trimstart": "^1.0.1"
- }
- }
+ "es-abstract": "^1.18.0-next.1"
}
},
"string_decoder": {
diff --git a/app/package.json b/app/package.json
index 15a9d60..99546a9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -12,6 +12,7 @@
"core-js": "^3.6.5",
"file-loader": "^6.1.1",
"ipfs": "^0.50.0",
+ "ipfs-http-client": "^47.0.1",
"marked": "^1.2.0",
"pixi.js": "^5.3.3",
"pouchdb": "^7.2.2",
@@ -22,11 +23,11 @@
"vuex": "^3.5.1"
},
"devDependencies": {
- "@vue/cli-plugin-babel": "^4.5.7",
- "@vue/cli-plugin-eslint": "^4.5.7",
- "@vue/cli-plugin-router": "^4.5.7",
- "@vue/cli-plugin-vuex": "^4.5.7",
- "@vue/cli-service": "^4.5.7",
+ "@vue/cli-plugin-babel": "^4.5.8",
+ "@vue/cli-plugin-eslint": "^4.5.8",
+ "@vue/cli-plugin-router": "^4.5.8",
+ "@vue/cli-plugin-vuex": "^4.5.8",
+ "@vue/cli-service": "^4.5.8",
"@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.0.3",
"eslint": "^7.11.0",
diff --git a/app/src/components/Navigation.vue b/app/src/components/Navigation.vue
index a56b5c2..e14f17d 100644
--- a/app/src/components/Navigation.vue
+++ b/app/src/components/Navigation.vue
@@ -10,11 +10,11 @@
import { routes } from '../router'
export default {
- data: function() {
+ data: function () {
return {
- routes: routes.filter(route => !!route.name)
+ routes: routes.filter((route) => !!route.name),
}
- }
+ },
}
</script>
diff --git a/app/src/components/OnBoard.vue b/app/src/components/OnBoard.vue
index 8a5245e..cb76a8c 100644
--- a/app/src/components/OnBoard.vue
+++ b/app/src/components/OnBoard.vue
@@ -35,7 +35,12 @@
</div>
</div>
<div v-else>
- <h4>Saved</h4>
+ <h4>Stored as : {{ clientid }}</h4>
+ <div class="btn-row">
+ <BaseButton buttonClass="special" @click="clearClient()"
+ >Clear</BaseButton
+ >
+ </div>
</div>
</div>
</vue-draggable-resizable>
@@ -104,7 +109,12 @@
</div>
</div>
<div v-else>
- <h4>Saved</h4>
+ <h4>Stored as : {{ clientid }}</h4>
+ <div class="btn-row">
+ <BaseButton buttonClass="special" @click="clearClient()"
+ >Clear</BaseButton
+ >
+ </div>
</div>
</div>
@@ -160,6 +170,10 @@ export default {
},
mounted() {
+ if (localStorage.myNNClient) {
+ this.clientid = localStorage.myNNClient
+ this.setClient()
+ }
if (localStorage.myNNClient && localStorage.mylastMicrocosm) {
this.clientid = localStorage.myNNClient
this.localmicrocosm = localStorage.mylastMicrocosm
@@ -168,6 +182,7 @@ export default {
this.letsGo()
}
},
+
filters: {
marked: marked,
},
@@ -185,6 +200,12 @@ export default {
this.focusInput()
},
+ clearClient() {
+ this.clientid = ''
+ this.name = false
+ localStorage.removeItem('myNNClient')
+ },
+
editTrue(e) {
this.$emit('editTrue', e)
},
diff --git a/app/src/components/old/ControlsLayer.vue b/app/src/components/old/ControlsLayer.vue
index 4353d7a..4bdbb4c 100644
--- a/app/src/components/old/ControlsLayer.vue
+++ b/app/src/components/old/ControlsLayer.vue
@@ -61,7 +61,7 @@ export default {
// or export state.notes to JSON file
},
removeLocal: function () {
- localStorage.removeItem('myNNClient')
+ //localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm')
// Hardcoded as when I set a URL had parameters the reload fails
//location.assign('https://alpha.nodenogg.in/')
diff --git a/app/src/experimental/ModeToolbar.vue b/app/src/experimental/ModeToolbar.vue
index 60e1a18..5986008 100644
--- a/app/src/experimental/ModeToolbar.vue
+++ b/app/src/experimental/ModeToolbar.vue
@@ -12,8 +12,7 @@
/>
</button>
- {{ clientid }} /
- {{ microcosm }}
+ <p>{{ clientid }} / {{ microcosm }}</p>
</nav>
</template>
@@ -69,7 +68,7 @@ export default {
},
removeLocal: function () {
- localStorage.removeItem('myNNClient')
+ //localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm')
location.assign(
diff --git a/app/src/router/index.js b/app/src/router/index.js
index aeb3fbc..83879cc 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -46,12 +46,6 @@ export const routes = [
import(/* webpackChunkName: "about" */ '../views/About.vue'),
},
- {
- path: '/leave',
- name: 'Leave',
- component: Leave,
- },
-
// {
// path: '/test',
// name: 'IPFS Test',
diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue
index b2fc5ec..e0a859d 100644
--- a/app/src/views/Cards.vue
+++ b/app/src/views/Cards.vue
@@ -30,6 +30,7 @@
</div>
<div v-else>
+ <!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer
v-for="value in otherNodes"
v-bind:key="value.node_id"
@@ -37,6 +38,7 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+ <!-- </div> -->
<NodesLayer
@editTrue="(e) => editTrue(e)"
v-for="value in myNodes"
@@ -45,13 +47,14 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>
</div>
</template>
<script>
-//import Router from '@/router'
+import Router from '@/router'
import CardsLayer from '@/components/CardsLayer'
import OtherCardslayer from '@/components/OtherCardslayer'
import OnBoard from '@/components/OnBoard'
@@ -68,6 +71,7 @@ export default {
mixins: [shortcutsMixin],
data: function () {
return {
+ currentroute: Router.currentRoute,
clientset: false,
}
},
diff --git a/app/src/views/Discarded.vue b/app/src/views/Discarded.vue
index 0d689cc..25e7a12 100644
--- a/app/src/views/Discarded.vue
+++ b/app/src/views/Discarded.vue
@@ -13,6 +13,7 @@
</div>
<div v-else>
+ <!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer
v-for="value in otherNodes"
v-bind:key="value.node_id"
@@ -20,6 +21,7 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+ <!-- </div> -->
<NodesLayer
@editTrue="(e) => editTrue(e)"
v-for="value in myNodes"
@@ -28,12 +30,14 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>
</div>
</template>
<script>
+import Router from '@/router'
import DiscardLayer from '@/components/DiscardLayer'
import OnBoard from '@/components/OnBoard'
import NodesLayer from '@/components/NodesLayer'
@@ -48,6 +52,7 @@ export default {
mixins: [shortcutsMixin],
data: function () {
return {
+ currentroute: Router.currentRoute,
clientset: false,
}
},
diff --git a/app/src/views/Leave.vue b/app/src/views/Leave.vue
index 2a0432d..9716bbc 100644
--- a/app/src/views/Leave.vue
+++ b/app/src/views/Leave.vue
@@ -11,7 +11,7 @@ export default {
methods: {
removeLocal: function () {
- localStorage.removeItem('myNNClient')
+ // localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm')
location.assign(
diff --git a/app/src/views/List.vue b/app/src/views/List.vue
index 2a80e23..5886495 100644
--- a/app/src/views/List.vue
+++ b/app/src/views/List.vue
@@ -19,6 +19,7 @@
</div>
</div>
<div v-else>
+ <!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer
v-for="value in otherNodes"
v-bind:key="value.node_id"
@@ -26,6 +27,7 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+ <!-- </div> -->
<NodesLayer
@editTrue="(e) => editTrue(e)"
v-for="value in myNodes"
@@ -34,13 +36,14 @@
v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted"
/>
+
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>
</div>
</template>
<script>
-//import Router from '@/router'
+import Router from '@/router'
import ListLayer from '@/components/ListLayer'
import OnBoard from '@/components/OnBoard'
import NodesLayer from '@/components/NodesLayer'
@@ -56,6 +59,7 @@ export default {
mixins: [shortcutsMixin],
data: function () {
return {
+ currentroute: Router.currentRoute,
clientset: false,
}
},
@@ -69,6 +73,7 @@ export default {
computed: {
...mapState({
myNodes: (state) => state.myNodes,
+ otherNodes: (state) => state.otherNodes,
shortcutstate: (state) => state.shortcutstate,
toolmode: (state) => state.ui.mode,
}),
--
GitLab