diff --git a/app/src/assets/files/collect.png b/app/src/assets/files/collect.png deleted file mode 100644 index 647a9219ea462f1172b1ca394baf446e5eeaa623..0000000000000000000000000000000000000000 Binary files a/app/src/assets/files/collect.png and /dev/null differ diff --git a/app/src/components/CardsLayer.vue b/app/src/components/CardsLayer.vue index 8adec76acaaa0e242dd3b60595aa868aeac85b80..408cbe34e5c1cc8b4270f1c8a94444537f907156 100644 --- a/app/src/components/CardsLayer.vue +++ b/app/src/components/CardsLayer.vue @@ -16,9 +16,6 @@ ></textarea> </div> - <!-- <div v-if="localreadmode == true && deleted == false"> - <p class="read" :id="nodeid" :inner-html.prop="nodetext | marked"></p> - </div> --> <div class="allemoji"> <div class="eachemoji" @@ -35,16 +32,6 @@ <BaseButton buttonClass="danger" @click="deleteFlag()" >Discard</BaseButton > - <!-- <div v-if="localreadmode == true && deleted == false"> - <BaseButton class="read" buttonClass="action" @click="readFlag()" - >Edit Mode - </BaseButton> - </div> - <div v-else> - <BaseButton class="read" buttonClass="action" @click="readFlag()" - >Read Mode</BaseButton - > - </div> --> </div> </form> </div> @@ -100,27 +87,9 @@ export default { // nothing happens } }, - - // readFlag(e) { - // e = this.nodeid - - // var i - // for (i = 0; i < Object.keys(this.configPositions).length; i++) { - // if (this.configPositions[i].node_id == this.nodeid) { - // this.localreadmode = this.configPositions[i].read_mode - // } - // } - - // if (this.localreadmode == true) { - // readmode = false - // this.$store.dispatch('readFlag', { e, readmode }) - // this.mode = 'Read' - // } else { - // readmode = true - // this.$store.dispatch('readFlag', { e, readmode }) - // this.mode = 'Edit' - // } - // }, + setFocus() { + console.log('called') + }, }, } </script> @@ -142,6 +111,7 @@ textarea { width: 90%; height: 175px; resize: none; + font-size: 18px; box-sizing: border-box; font-family: 'Inter var', Helvetica, sans-serif; -webkit-font-smoothing: antialiased; diff --git a/app/src/components/ListLayer.vue b/app/src/components/ListLayer.vue index e53d8212b3233bea92aacac944062a5a97cf9f6c..342e3f04c1c76c8126ad5637c78572b7d0648f9f 100644 --- a/app/src/components/ListLayer.vue +++ b/app/src/components/ListLayer.vue @@ -17,10 +17,11 @@ placeholder="Idea goes here!(auto saved every keystroke)" ></textarea> </div> + <p class="info">*markdown supported & autosaves</p> </div> <div v-if="value.read_mode && deleted == false"> <p - class="read" + class="readmode" :id="nodeid" :inner-html.prop="nodetext | marked" ></p> @@ -37,7 +38,7 @@ </p> </div> </div> - <p class="info">*markdown supported & autosaves</p> + <div class="btn-row"> <BaseButton buttonClass="danger" @click="deleteFlag()" >Discard</BaseButton @@ -151,6 +152,11 @@ h2 { margin-left: 1em; } +.readmode { + margin-top: 1em; + margin-left: 1em; +} + textarea { width: 90%; height: 175px; diff --git a/app/src/components/NodesLayer.vue b/app/src/components/NodesLayer.vue index b6b2ba255ffde085f93f751f5e591818b70a553c..e39ba491343f79e9de6acaa104ca0699d910e938 100644 --- a/app/src/components/NodesLayer.vue +++ b/app/src/components/NodesLayer.vue @@ -32,6 +32,7 @@ placeholder="Idea goes here! (auto saved every keystroke)" ></textarea> </div> + <p class="info">*markdown supported & autosaves</p> </div> <div v-if="value.read_mode == true"> <p @@ -54,7 +55,7 @@ </p> </div> </div> - <p class="info">*markdown supported & autosaves</p> + <div class="btn-row"> <!-- <BaseButton buttonClass="danger" @click="deleteFlag()" >Delete</BaseButton @@ -119,6 +120,7 @@ </textarea> </div> </div> + <p class="info">*markdown supported & autosaves</p> </div> <div v-if="value.read_mode == true"> <p @@ -140,7 +142,6 @@ </p> </div> </div> - <p class="info">*markdown supported & autosaves</p> <div class="btn-row"> <BaseButton buttonClass="danger" @click="deleteFlag()" >Discard</BaseButton diff --git a/app/src/components/OtherCardslayer.vue b/app/src/components/OtherCardslayer.vue index 83a7c42aefa8241c3bf5bc60a52f5c2ee51b7883..1cc8d207dfd03fc32f7eaff155332e002d429dca 100644 --- a/app/src/components/OtherCardslayer.vue +++ b/app/src/components/OtherCardslayer.vue @@ -54,8 +54,8 @@ h2 { .nodes { width: 300px; - border: 2px dashed black; - background-color: rgb(155, 194, 216); + border: 2px solid black; + background-color: rgb(205, 234, 255); margin-top: 1em; margin-left: 1em; } diff --git a/app/src/components/OtherNodeslayer.vue b/app/src/components/OtherNodeslayer.vue index abda229841cadad5b8b0aed5d20965f2ad7ff360..352e039aca71b6e82b6b3fb6c79e15b081c1c708 100644 --- a/app/src/components/OtherNodeslayer.vue +++ b/app/src/components/OtherNodeslayer.vue @@ -358,7 +358,7 @@ export default { <!-- Add "scoped" attribute to limit CSS to this component only --> <style scoped> .node { - background-color: aquamarine; + background-color: rgb(205, 234, 255); position: absolute; } diff --git a/app/src/store/index.js b/app/src/store/index.js index 96babdda279103760552e6de6ba56f516a66c62f..773cc6025e7622e683f9d6cb3b0878dd559042b4 100644 --- a/app/src/store/index.js +++ b/app/src/store/index.js @@ -174,10 +174,10 @@ const store = new Vuex.Store({ }) .catch(function (err) { if (err.status == 404) { - var startup = '777' - // var uniqueid = - // Math.random().toString(36).substring(2, 15) + - // Math.random().toString(36).substring(2, 15) + var startup = + Math.random().toString(36).substring(2, 15) + + Math.random().toString(36).substring(2, 15) + return pouchdb.put({ _id: state.myclient, _attachments: {}, diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue index 834e0fe62f4e021cd7f892e5dfe3e6268c3c94f4..a589ff1b56a14f6483a3c652453b399d6c1b1c7b 100644 --- a/app/src/views/Cards.vue +++ b/app/src/views/Cards.vue @@ -1,13 +1,7 @@ <template> <div id="listwrapper"> <div v-if="clientset"> - <h1 class="mobile">Your nodes - list mode</h1> - - <div class="btn-row"> - <BaseButton class="new" buttonClass="action" @click="addNode()" - >Create Node</BaseButton - > - </div> + <h1 class="mobile">All nodes - card view</h1> <div class="grid"> <CardsLayer @@ -27,6 +21,34 @@ v-bind:deleted="value.deleted" /> </div> + + <div class="btn-row"> + <!-- <BaseButton class="new" buttonClass="action" @click="addNode()" + >Create Node</BaseButton + > --> + + <svg + xmlns="http://www.w3.org/2000/svg" + width="80" + viewBox="0 0 143 106" + class="icon" + @click="addNode()" + ref="adding" + > + <g transform="translate(-1345 -843)"> + <g class="a" transform="translate(1345 865)"> + <rect class="d" width="127" height="84" /> + <rect class="e" x="0.5" y="0.5" width="126" height="83" /> + </g> + <g class="b" transform="translate(1361 843)"> + <rect class="d" width="127" height="84" /> + <rect class="e" x="3.5" y="3.5" width="120" height="77" /> + </g> + <line class="c" x2="41" transform="translate(1406.5 884.5)" /> + <line class="c" y2="41" transform="translate(1426.5 863.5)" /> + </g> + </svg> + </div> </div> <div v-else> @@ -88,6 +110,7 @@ export default { addNode() { this.$store.dispatch('addNode') + this.$refs.adding.setFocus }, editTrue(e) { @@ -116,4 +139,34 @@ export default { .new { margin-bottom: 1em; } + +.example { + width: 30px; +} + +.icon { + margin-left: 1em; + padding: 0.5em; + cursor: pointer; +} + +.a { + fill: #333; + stroke: #707070; +} +.b { + fill: #fff; +} +.b, +.c { + stroke: #333; + stroke-width: 7px; +} +.c, +.e { + fill: none; +} +.d { + stroke: none; +} </style>