diff --git a/app/src/components/BaseButton.vue b/app/src/components/BaseButton.vue index 0ce8b1d5fcb29a6cf8146701dd43e56c9b2e42cd..f314cad0f7ac456b6f9845afe18616dad4458aba 100644 --- a/app/src/components/BaseButton.vue +++ b/app/src/components/BaseButton.vue @@ -19,7 +19,7 @@ export default { <style lang="css" scoped> button { - font-size: 1em; + font-size: 0.8em; touch-action: manipulation; color: black; border: none; diff --git a/app/src/components/NodesLayer.vue b/app/src/components/NodesLayer.vue index 677ffab2bc0fd49bffcac095f3d3c17eea1b5e78..f230b2d55145be5bfbf455bc248828be2e8a9327 100644 --- a/app/src/components/NodesLayer.vue +++ b/app/src/components/NodesLayer.vue @@ -26,7 +26,7 @@ :id="nodeid" class="drag-cancel" ref="nodetext" - placeholder="Idea goes here!" + placeholder="Idea goes here! (auto saved every keystroke)" ></textarea> </div> </div> @@ -47,6 +47,7 @@ </div> <p class="info">*markdown supported</p> + <p class="info">*autosaves</p> <div class="btn-row"> <BaseButton buttonClass="danger" @click="deleteFlag()" >Delete</BaseButton @@ -56,7 +57,7 @@ class="read" buttonClass="action" @click="readFlag()" - >Edit + >Edit Mode </BaseButton> </div> <div v-else> @@ -64,7 +65,7 @@ class="read" buttonClass="action" @click="readFlag()" - >Read</BaseButton + >Read Mode</BaseButton > </div> </div> @@ -104,7 +105,7 @@ :id="nodeid" class="drag-cancel" ref="nodetext" - placeholder="Idea goes here!" + placeholder="Idea goes here! (auto saved every keystroke)" ></textarea> </div> </div> @@ -125,6 +126,7 @@ </div> <p class="info">*markdown supported</p> + <p class="info">*autosaves</p> <div class="btn-row"> <BaseButton buttonClass="danger" @click="deleteFlag()" >Delete</BaseButton @@ -134,7 +136,7 @@ class="read" buttonClass="action" @click="readFlag()" - >Edit + >Edit Mode </BaseButton> </div> <div v-else> @@ -142,7 +144,7 @@ class="read" buttonClass="action" @click="readFlag()" - >Read</BaseButton + >Read Mode</BaseButton > </div> </div> diff --git a/app/src/components/OnBoard.vue b/app/src/components/OnBoard.vue index c34c3b68e9cee0e4ae6e7814bbd7e675d9ce1a7f..ef9078e2153dc3b6054754987c65f6c55a338ab0 100644 --- a/app/src/components/OnBoard.vue +++ b/app/src/components/OnBoard.vue @@ -13,21 +13,27 @@ <form> <div> <p id="nodeid" :inner-html.prop="nodetext | marked"></p> - <input - type="text" - v-model.trim="clientid" - placeholder="device name" - autocorrect="off" - autocapitalize="none" - ref="objectname" - v-on:keyup.enter="setClient()" - @focus="editTrue(true)" - @blur="editTrue(false)" - /> - <div class="btn-row"> - <BaseButton buttonClass="special" @click="setClient()" - >Store</BaseButton - > + <div v-if="name == false"> + <input + type="text" + v-model.trim="clientid" + placeholder="name" + autocorrect="off" + autocapitalize="none" + ref="objectname" + v-on:keyup.enter="setClient()" + @focus="editTrue(true)" + @blur="editTrue(false)" + /> + + <div class="btn-row"> + <BaseButton buttonClass="special" @click="setClient()" + >Store</BaseButton + > + </div> + </div> + <div v-else> + <h4>Saved</h4> </div> </div> </form> @@ -46,23 +52,29 @@ <form> <div> <p id="nodeid" :inner-html.prop="nodetext2 | marked"></p> - <input - type="text" - v-model.trim="localmicrocosm" - placeholder="microcosm name" - autocorrect="off" - autocapitalize="none" - autofocus - v-on:keyup.enter="createMicrocosm()" - @focus="editTrue(true)" - @blur="editTrue(false)" - /> - <div class="btn-row"> - <BaseButton - buttonClass="special" - @click="createMicrocosm(), letsGo()" - >Create Microcosm</BaseButton - > + <div v-if="microcosm == false"> + <input + type="text" + v-model.trim="localmicrocosm" + placeholder="microcosm name" + autocorrect="off" + autocapitalize="none" + autofocus + v-on:keyup.enter="createMicrocosm()" + @focus="editTrue(true)" + @blur="editTrue(false)" + /> + + <div class="btn-row"> + <BaseButton + buttonClass="special" + @click="createMicrocosm(), letsGo()" + >Create or Rejoin a Microcosm</BaseButton + > + </div> + </div> + <div v-else> + <h4>Loading...</h4> </div> </div> </form> @@ -83,8 +95,8 @@ export default { '## 3. What shall we call you ? 💥 \n First we need to connect this device to your ideas. This name is what allows you to create and edit your nodes and can be anything you like and this name is always anonymous.', nodetext2: '## 5. Start those engines ! 🎠\n Now you can create your own microcosm to store your ideas and ask people to join you, either just tell them the name of the microcosm or share the alpha.nodenogg.in URL and add the ending; </br><em><b>/microcosm/nameofyourmicrocosm</b></em>', - // parta: true, - // partb: false, + name: false, + microcosm: false, // partc: false, } }, @@ -106,10 +118,12 @@ export default { createMicrocosm() { this.$store.dispatch('createMicrocosm', this.localmicrocosm) localStorage.setItem('mylastMicrocosm', this.localmicrocosm) + this.microcosm = true }, setClient() { this.$store.dispatch('setClient', this.clientid), localStorage.setItem('myNNClient', this.clientid) + this.name = true }, editTrue(e) { diff --git a/app/src/experimental/modes/index.js b/app/src/experimental/modes/index.js index 1aad8696c73171955b06bbf77cf85664ce84f39b..a0aed2cfc45f2bd7c1d5749260812049992806a6 100644 --- a/app/src/experimental/modes/index.js +++ b/app/src/experimental/modes/index.js @@ -31,16 +31,16 @@ export const move = { shortcut: false, } -export const connect = { - name: 'connect', - view: { - pan: false, - zoom: false, - }, - icon: 'connection', - cursor: 'crosshair', - shortcut: false, -} +// export const connect = { +// name: 'connect', +// view: { +// pan: false, +// zoom: false, +// }, +// icon: 'connection', +// cursor: 'crosshair', +// shortcut: false, +// } export const draw = { name: 'draw', diff --git a/app/src/store/index.js b/app/src/store/index.js index 6009a5c0acda0d271404c64bf926b03a45d18f0f..7b7a22e8b4698ce31687241485605b864c42d207 100644 --- a/app/src/store/index.js +++ b/app/src/store/index.js @@ -366,7 +366,7 @@ const store = new Vuex.Store({ x_pos: 50, y_pos: 50, width: 220, - height: 275, + height: 295, z_index: 1, read_mode: false, })