Skip to content
Snippets Groups Projects
Commit 1b0f5e1b authored by Adam Procter's avatar Adam Procter
Browse files

updated

trying to sort out router ios issue
trying to make device name storage more persistent to support quicker movement between microcosms.
parent 56805c9b
No related branches found
No related tags found
No related merge requests found
No preview for this file type
# 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 # 0.1.28
_10th October 2020_ _10th October 2020_
......
This diff is collapsed.
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"core-js": "^3.6.5", "core-js": "^3.6.5",
"file-loader": "^6.1.1", "file-loader": "^6.1.1",
"ipfs": "^0.50.0", "ipfs": "^0.50.0",
"ipfs-http-client": "^47.0.1",
"marked": "^1.2.0", "marked": "^1.2.0",
"pixi.js": "^5.3.3", "pixi.js": "^5.3.3",
"pouchdb": "^7.2.2", "pouchdb": "^7.2.2",
...@@ -22,11 +23,11 @@ ...@@ -22,11 +23,11 @@
"vuex": "^3.5.1" "vuex": "^3.5.1"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "^4.5.7", "@vue/cli-plugin-babel": "^4.5.8",
"@vue/cli-plugin-eslint": "^4.5.7", "@vue/cli-plugin-eslint": "^4.5.8",
"@vue/cli-plugin-router": "^4.5.7", "@vue/cli-plugin-router": "^4.5.8",
"@vue/cli-plugin-vuex": "^4.5.7", "@vue/cli-plugin-vuex": "^4.5.8",
"@vue/cli-service": "^4.5.7", "@vue/cli-service": "^4.5.8",
"@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.0.3", "babel-eslint": "^10.0.3",
"eslint": "^7.11.0", "eslint": "^7.11.0",
......
...@@ -12,9 +12,9 @@ import { routes } from '../router' ...@@ -12,9 +12,9 @@ import { routes } from '../router'
export default { export default {
data: function () { data: function () {
return { return {
routes: routes.filter(route => !!route.name) routes: routes.filter((route) => !!route.name),
}
} }
},
} }
</script> </script>
......
...@@ -35,7 +35,12 @@ ...@@ -35,7 +35,12 @@
</div> </div>
</div> </div>
<div v-else> <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>
</div> </div>
</vue-draggable-resizable> </vue-draggable-resizable>
...@@ -104,7 +109,12 @@ ...@@ -104,7 +109,12 @@
</div> </div>
</div> </div>
<div v-else> <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>
</div> </div>
...@@ -160,6 +170,10 @@ export default { ...@@ -160,6 +170,10 @@ export default {
}, },
mounted() { mounted() {
if (localStorage.myNNClient) {
this.clientid = localStorage.myNNClient
this.setClient()
}
if (localStorage.myNNClient && localStorage.mylastMicrocosm) { if (localStorage.myNNClient && localStorage.mylastMicrocosm) {
this.clientid = localStorage.myNNClient this.clientid = localStorage.myNNClient
this.localmicrocosm = localStorage.mylastMicrocosm this.localmicrocosm = localStorage.mylastMicrocosm
...@@ -168,6 +182,7 @@ export default { ...@@ -168,6 +182,7 @@ export default {
this.letsGo() this.letsGo()
} }
}, },
filters: { filters: {
marked: marked, marked: marked,
}, },
...@@ -185,6 +200,12 @@ export default { ...@@ -185,6 +200,12 @@ export default {
this.focusInput() this.focusInput()
}, },
clearClient() {
this.clientid = ''
this.name = false
localStorage.removeItem('myNNClient')
},
editTrue(e) { editTrue(e) {
this.$emit('editTrue', e) this.$emit('editTrue', e)
}, },
......
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
// or export state.notes to JSON file // or export state.notes to JSON file
}, },
removeLocal: function () { removeLocal: function () {
localStorage.removeItem('myNNClient') //localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm') localStorage.removeItem('mylastMicrocosm')
// Hardcoded as when I set a URL had parameters the reload fails // Hardcoded as when I set a URL had parameters the reload fails
//location.assign('https://alpha.nodenogg.in/') //location.assign('https://alpha.nodenogg.in/')
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
/> />
</button> </button>
{{ clientid }} / <p>{{ clientid }} / {{ microcosm }}</p>
{{ microcosm }}
</nav> </nav>
</template> </template>
...@@ -69,7 +68,7 @@ export default { ...@@ -69,7 +68,7 @@ export default {
}, },
removeLocal: function () { removeLocal: function () {
localStorage.removeItem('myNNClient') //localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm') localStorage.removeItem('mylastMicrocosm')
location.assign( location.assign(
......
...@@ -46,12 +46,6 @@ export const routes = [ ...@@ -46,12 +46,6 @@ export const routes = [
import(/* webpackChunkName: "about" */ '../views/About.vue'), import(/* webpackChunkName: "about" */ '../views/About.vue'),
}, },
{
path: '/leave',
name: 'Leave',
component: Leave,
},
// { // {
// path: '/test', // path: '/test',
// name: 'IPFS Test', // name: 'IPFS Test',
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
</div> </div>
<div v-else> <div v-else>
<!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer <OtherNodeslayer
v-for="value in otherNodes" v-for="value in otherNodes"
v-bind:key="value.node_id" v-bind:key="value.node_id"
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<!-- </div> -->
<NodesLayer <NodesLayer
@editTrue="(e) => editTrue(e)" @editTrue="(e) => editTrue(e)"
v-for="value in myNodes" v-for="value in myNodes"
...@@ -45,13 +47,14 @@ ...@@ -45,13 +47,14 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" /> <OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
//import Router from '@/router' import Router from '@/router'
import CardsLayer from '@/components/CardsLayer' import CardsLayer from '@/components/CardsLayer'
import OtherCardslayer from '@/components/OtherCardslayer' import OtherCardslayer from '@/components/OtherCardslayer'
import OnBoard from '@/components/OnBoard' import OnBoard from '@/components/OnBoard'
...@@ -68,6 +71,7 @@ export default { ...@@ -68,6 +71,7 @@ export default {
mixins: [shortcutsMixin], mixins: [shortcutsMixin],
data: function () { data: function () {
return { return {
currentroute: Router.currentRoute,
clientset: false, clientset: false,
} }
}, },
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</div> </div>
<div v-else> <div v-else>
<!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer <OtherNodeslayer
v-for="value in otherNodes" v-for="value in otherNodes"
v-bind:key="value.node_id" v-bind:key="value.node_id"
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<!-- </div> -->
<NodesLayer <NodesLayer
@editTrue="(e) => editTrue(e)" @editTrue="(e) => editTrue(e)"
v-for="value in myNodes" v-for="value in myNodes"
...@@ -28,12 +30,14 @@ ...@@ -28,12 +30,14 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" /> <OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Router from '@/router'
import DiscardLayer from '@/components/DiscardLayer' import DiscardLayer from '@/components/DiscardLayer'
import OnBoard from '@/components/OnBoard' import OnBoard from '@/components/OnBoard'
import NodesLayer from '@/components/NodesLayer' import NodesLayer from '@/components/NodesLayer'
...@@ -48,6 +52,7 @@ export default { ...@@ -48,6 +52,7 @@ export default {
mixins: [shortcutsMixin], mixins: [shortcutsMixin],
data: function () { data: function () {
return { return {
currentroute: Router.currentRoute,
clientset: false, clientset: false,
} }
}, },
......
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
methods: { methods: {
removeLocal: function () { removeLocal: function () {
localStorage.removeItem('myNNClient') // localStorage.removeItem('myNNClient')
localStorage.removeItem('mylastMicrocosm') localStorage.removeItem('mylastMicrocosm')
location.assign( location.assign(
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
</div> </div>
</div> </div>
<div v-else> <div v-else>
<!-- <div v-if="this.currentroute.name == 'Home'"> -->
<OtherNodeslayer <OtherNodeslayer
v-for="value in otherNodes" v-for="value in otherNodes"
v-bind:key="value.node_id" v-bind:key="value.node_id"
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<!-- </div> -->
<NodesLayer <NodesLayer
@editTrue="(e) => editTrue(e)" @editTrue="(e) => editTrue(e)"
v-for="value in myNodes" v-for="value in myNodes"
...@@ -34,13 +36,14 @@ ...@@ -34,13 +36,14 @@
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
v-bind:deleted="value.deleted" v-bind:deleted="value.deleted"
/> />
<OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" /> <OnBoard @clientAdded="clientAdded()" @editTrue="(e) => editTrue(e)" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
//import Router from '@/router' import Router from '@/router'
import ListLayer from '@/components/ListLayer' import ListLayer from '@/components/ListLayer'
import OnBoard from '@/components/OnBoard' import OnBoard from '@/components/OnBoard'
import NodesLayer from '@/components/NodesLayer' import NodesLayer from '@/components/NodesLayer'
...@@ -56,6 +59,7 @@ export default { ...@@ -56,6 +59,7 @@ export default {
mixins: [shortcutsMixin], mixins: [shortcutsMixin],
data: function () { data: function () {
return { return {
currentroute: Router.currentRoute,
clientset: false, clientset: false,
} }
}, },
...@@ -69,6 +73,7 @@ export default { ...@@ -69,6 +73,7 @@ export default {
computed: { computed: {
...mapState({ ...mapState({
myNodes: (state) => state.myNodes, myNodes: (state) => state.myNodes,
otherNodes: (state) => state.otherNodes,
shortcutstate: (state) => state.shortcutstate, shortcutstate: (state) => state.shortcutstate,
toolmode: (state) => state.ui.mode, toolmode: (state) => state.ui.mode,
}), }),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment