diff --git a/app/src/App.vue b/app/src/App.vue
index d6dc96eb99b715de647cd615f89a5ed905455234..5ea0d36f4c2aef0e4cd5f2b2ab1a922c7bd6d59d 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -1,7 +1,7 @@
<template>
<div id="app">
<navigation />
- <router-view />
+ <router-view :key="$route.fullPath"></router-view>
</div>
</template>
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 83879cc8c8c51eed1508cee1da6c44e1cfa1f4b4..42978783b7dc574a6dc206b21fd19fb0c5498ccc 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -5,6 +5,9 @@ import Cards from '../views/Cards.vue'
import List from '../views/List.vue'
import Discarded from '../views/Discarded.vue'
import Leave from '../views/Leave.vue'
+import About from '../views/About.vue'
+import NotFound from '../views/NotFound.vue'
+//import store from '../store'
// import Oldhome from '../views/Oldhome'
//import Test from '../views/Test'
@@ -13,19 +16,21 @@ Vue.use(VueRouter)
export const routes = [
{
path: '/',
- name: 'Home',
+ name: 'Collect',
+ component: List,
+ },
+ {
+ path: '/organise',
+ name: 'Organise',
component: Home,
},
+
{
path: '/cards',
name: 'Cards',
component: Cards,
},
- {
- path: '/list',
- name: 'My List',
- component: List,
- },
+
{
path: '/discarded',
name: 'Discarded',
@@ -39,38 +44,20 @@ export const routes = [
{
path: '/about',
name: 'About',
- // route level code-splitting
- // this generates a separate chunk (about.[hash].js) for this route
- // which is lazy-loaded when the route is visited.
- component: () =>
- import(/* webpackChunkName: "about" */ '../views/About.vue'),
- },
-
- // {
- // path: '/test',
- // name: 'IPFS Test',
- // component: Test,
- // },
- // {
- // path: '/oldhome',
- // name: 'Old Home',
- // component: Oldhome,
- // },
-
- // dynamic segement `:microcosm` is added to the path
- {
- path: '/microcosm/:microcosm',
- component: Home,
+ component: About,
},
{
// catches 404 errors
path: '*',
name: '404',
- component: () =>
- import(
- /* webpackChunkName: "NotFoundComponent" */ '../views/NotFound.vue'
- ),
+ component: NotFound,
+ },
+
+ // dynamic segement `:microcosm` is added to the path
+ {
+ path: '/microcosm/:microcosm',
+ component: List,
},
]
@@ -82,4 +69,5 @@ const router = new VueRouter({
routes,
})
+
export default router
diff --git a/app/src/store/index.js b/app/src/store/index.js
index d3756fb9575a9ae939f594a80470769396758cc7..709d16dfabed8e3061e038fc6abefa270e8b5a69 100644
--- a/app/src/store/index.js
+++ b/app/src/store/index.js
@@ -78,8 +78,8 @@ const store = new Vuex.Store({
pouchdb.close().then(function () {
if (urlmicrocosm != undefined) {
// myclient = urldevice
-
microcosm = urlmicrocosm
+ localStorage.setItem('mylastMicrocosm', microcosm)
} else {
microcosm = doc
}
diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue
index e0a859d138bbeae83b491e0a55e8b25d8f626ac2..2d35f60375a5fa8a122b8747ae1273b689fcb3ab 100644
--- a/app/src/views/Cards.vue
+++ b/app/src/views/Cards.vue
@@ -30,24 +30,24 @@
</div>
<div v-else>
- <!-- <div v-if="this.currentroute.name == 'Home'"> -->
- <OtherNodeslayer
- v-for="value in otherNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
- <!-- </div> -->
- <NodesLayer
- @editTrue="(e) => editTrue(e)"
- v-for="value in myNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
-
+ <div v-if="this.currentroute.name == 'Home'">
+ <OtherNodeslayer
+ v-for="value in otherNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ <!-- </div> -->
+ <NodesLayer
+ @editTrue="(e) => editTrue(e)"
+ v-for="value in myNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ </div>
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>
</div>
diff --git a/app/src/views/Discarded.vue b/app/src/views/Discarded.vue
index 25e7a12c2ee0b04b61652a95381ec2ec0f56a387..553dfdf7cf12ccda3d419347d6dff731f78dc759 100644
--- a/app/src/views/Discarded.vue
+++ b/app/src/views/Discarded.vue
@@ -13,24 +13,24 @@
</div>
<div v-else>
- <!-- <div v-if="this.currentroute.name == 'Home'"> -->
- <OtherNodeslayer
- v-for="value in otherNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
- <!-- </div> -->
- <NodesLayer
- @editTrue="(e) => editTrue(e)"
- v-for="value in myNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
-
+ <div v-if="this.currentroute.name == 'Home'">
+ <OtherNodeslayer
+ v-for="value in otherNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ <!-- </div> -->
+ <NodesLayer
+ @editTrue="(e) => editTrue(e)"
+ v-for="value in myNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ </div>
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>
</div>
diff --git a/app/src/views/Home.vue b/app/src/views/Home.vue
index 49e7b7369fa6b86172876c437f09caa7f4730f27..54e86809187453df1caa0397505b433beff7fcf9 100644
--- a/app/src/views/Home.vue
+++ b/app/src/views/Home.vue
@@ -137,6 +137,11 @@ export default {
// shortcutstate: false,
}
},
+
+ // beforeRouteLeave(to, from, next) {
+ // this.$store.commit('GET_ALL_NODES')
+ // next()
+ // },
computed: {
domContainerReady() {
return !!this.elementWidth && !!this.elementHeight
diff --git a/app/src/views/List.vue b/app/src/views/List.vue
index 58864958d089c6aa2f910a7771b94d0c9e00c8c7..35514228f7228601fbd713e92126a866a2c69a72 100644
--- a/app/src/views/List.vue
+++ b/app/src/views/List.vue
@@ -19,23 +19,24 @@
</div>
</div>
<div v-else>
- <!-- <div v-if="this.currentroute.name == 'Home'"> -->
- <OtherNodeslayer
- v-for="value in otherNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
- <!-- </div> -->
- <NodesLayer
- @editTrue="(e) => editTrue(e)"
- v-for="value in myNodes"
- v-bind:key="value.node_id"
- v-bind:nodeid="value.node_id"
- v-bind:nodetext="value.node_text"
- v-bind:deleted="value.deleted"
- />
+ <div v-if="this.currentroute.name == 'Home'">
+ <OtherNodeslayer
+ v-for="value in otherNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ <!-- </div> -->
+ <NodesLayer
+ @editTrue="(e) => editTrue(e)"
+ v-for="value in myNodes"
+ v-bind:key="value.node_id"
+ v-bind:nodeid="value.node_id"
+ v-bind:nodetext="value.node_text"
+ v-bind:deleted="value.deleted"
+ />
+ </div>
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div>