From 438802ec228aa793f08dfc25574b82fe0ca352a8 Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Sat, 24 Oct 2020 14:29:31 +0100
Subject: [PATCH] fixed ios router issue
---
.DS_Store | Bin 10244 -> 10244 bytes
app/src/components/OnBoard.vue | 49 +++++++++++----------------------
2 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 13cf4b32c8de27b40f64c35a81334e7b4783bc3f..670dedcc40191aabe3bcfdbdff9588853e866ddc 100644
GIT binary patch
delta 202
zcmZn(XbIThF5vbpsURn_xWvHV1|t(Q3o9Et2PYRN4<{cdXKZjretB?7Vo7PSQ({rP
zfJ|^^N@`MKQFvxbNk&L&o@-8OS!$ktkxybt>f{Om&x~l0hJeJ944@)TWrs8e1`y!n
z;EWfLtghCzFtpTBFflZ*)lsN6H!}yajm>InIXO8b)!l;PN}Kv-&0ex}+493jz}grX
d86h--Ae4qtM>h)!p5)uiuJD^>^HmWhW&k-GHLCys
delta 160
zcmZn(XbIThE?{^vsURn_xWvHVIwKP^3o9Et2L}f?2QNo#a7KQ4a7kiGX|YpcQ8b7b
zkXVwDlsLIpz%zi8laqrpUO=L{+QiaSN5Ry{xK>A@+T7egN5RC{thSbuLtNF+)-xfu
qvZ}hKwr(Z^7%(zIXa;^L4Wnjlwi7(bH?cu?GrPiXmd*O2Ow0gl$|h3)
diff --git a/app/src/components/OnBoard.vue b/app/src/components/OnBoard.vue
index 71b4193..fe42e25 100644
--- a/app/src/components/OnBoard.vue
+++ b/app/src/components/OnBoard.vue
@@ -1,6 +1,6 @@
<template>
<div ref="nodes" class="node">
- <div v-if="this.currentroute.name == 'Organise'">
+ <div v-if="this.currentroute.name == 'Home'">
<vue-draggable-resizable
class="innernode"
:w="300"
@@ -35,12 +35,7 @@
</div>
</div>
<div v-else>
- <h4>Stored as : {{ clientid }}</h4>
- <div class="btn-row">
- <BaseButton buttonClass="special" @click="clearClient()"
- >Clear</BaseButton
- >
- </div>
+ <h4>Saved</h4>
</div>
</div>
</vue-draggable-resizable>
@@ -78,25 +73,25 @@
>Create or Rejoin a Microcosm</BaseButton
>
</div>
- <!-- </div> -->
- <!-- <div v-else> -->
+ </div>
+ <div v-else>
<h4>Loading...</h4>
</div>
</div>
</vue-draggable-resizable>
</div>
<div v-else>
- <div>
- <vue-draggable-resizable> </vue-draggable-resizable>
+ <div class="nodes">
+ <vue-draggable-resizable class="hide"></vue-draggable-resizable>
<p id="nodeid" :inner-html.prop="nodetext | marked"></p>
<div v-if="name == false">
<input
type="text"
+ id="clientid"
v-model.trim="clientid"
placeholder="name"
autocorrect="off"
autocapitalize="none"
- ref="objectname"
v-on:keyup.enter="setClient()"
autofocus
@focus="editTrue(true)"
@@ -110,26 +105,22 @@
</div>
</div>
<div v-else>
- <h4>Stored as : {{ clientid }}</h4>
- <div class="btn-row">
- <BaseButton buttonClass="special" @click="clearClient()"
- >Clear</BaseButton
- >
- </div>
+ <h4>Saved</h4>
</div>
</div>
- <div class="content">
+ <div class="nodes">
<p id="nodeid" :inner-html.prop="nodetext2 | marked"></p>
<div v-if="microcosm == false">
<input
+ id="microcosm"
type="text"
v-model.trim="localmicrocosm"
placeholder="microcosm name"
autocorrect="off"
+ ref="microcosm"
autocapitalize="none"
@focus="editTrue(true)"
- ref="microcosm"
@blur="editTrue(false)"
v-on:keyup.enter="createMicrocosm(), letsGo()"
/>
@@ -141,8 +132,8 @@
>Create or Rejoin a Microcosm</BaseButton
>
</div>
- <!-- </div> -->
- <!-- <div v-else> -->
+ </div>
+ <div v-else>
<h4>Loading...</h4>
</div>
</div>
@@ -170,10 +161,6 @@ 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
@@ -182,7 +169,6 @@ export default {
this.letsGo()
}
},
-
filters: {
marked: marked,
},
@@ -200,12 +186,6 @@ export default {
this.focusInput()
},
- clearClient() {
- this.clientid = ''
- this.name = false
- localStorage.removeItem('myNNClient')
- },
-
editTrue(e) {
this.$emit('editTrue', e)
},
@@ -222,6 +202,9 @@ export default {
</script>
<style lang="css" scoped>
+.hide {
+ display: none;
+}
.vdr {
padding: 0 0.5em;
}
--
GitLab