From beff7213cc172b6159bd6bafe0a8ccd2453e29da Mon Sep 17 00:00:00 2001 From: Adam Procter <adamprocter@researchnot.es> Date: Fri, 20 Nov 2020 13:51:36 +0000 Subject: [PATCH] fixes to kebab case --- CHANGELOG.md | 2 +- app/src/components/DiscardLayer.vue | 1 - app/src/components/ListLayer.vue | 13 +------------ app/src/components/NodesLayer.vue | 2 +- app/src/components/UploadLayer.vue | 4 ++-- app/src/experimental/ModeToolbar.vue | 10 +++++----- app/src/views/Cards.vue | 4 ++-- app/src/views/List.vue | 6 +++--- app/src/views/Organise.vue | 26 +++++++++++++------------- 9 files changed, 28 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ca409..c8c517f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ _20th November 2020_ ### Fixed - a human can use spaces, dashes and caps if they like in name and microcosm but couchDB doesn't like them so they are removed on input -- you can no longer join and microcosm without setting a name, this stops human from thinking they are safe to create nodes +- you can no longer join a microcosm without setting a name, this stops human from thinking they are safe to create nodes # 0.1.35 diff --git a/app/src/components/DiscardLayer.vue b/app/src/components/DiscardLayer.vue index 05e59db..95c91a4 100644 --- a/app/src/components/DiscardLayer.vue +++ b/app/src/components/DiscardLayer.vue @@ -15,7 +15,6 @@ </p> </div> </div> - <div class="btn-row"> <BaseButton buttonClass="danger" @click="restoreNode(nodeid)" >Restore</BaseButton diff --git a/app/src/components/ListLayer.vue b/app/src/components/ListLayer.vue index afc9d8e..1c4a259 100644 --- a/app/src/components/ListLayer.vue +++ b/app/src/components/ListLayer.vue @@ -36,23 +36,12 @@ </div> <div class="btn-row"> - <!-- <BaseButton buttonClass="danger" @click="deleteFlag()" - >Discard</BaseButton - > --> <SvgButton buttonClass="nodes" @click.prevent="deleteFlag()" /> <div v-if="value.read_mode == true && deleted == false"> <SvgButton2 buttonClass="nodes" @click.prevent="readFlag()" /> - - <!-- <BaseButton class="read" buttonClass="action" @click="readFlag()" - >Edit Mode - </BaseButton> --> </div> <div v-else> <SvgButton2 buttonClass="nodes" @click.prevent="readFlag()" /> - - <!-- <BaseButton class="read" buttonClass="action" @click="readFlag()" - >Read Mode</BaseButton - > --> </div> </div> </form> @@ -107,7 +96,7 @@ export default { }, editTrue(e) { - this.$emit('editTrue', e) + this.$emit('edit-true', e) }, deleteFlag(e) { diff --git a/app/src/components/NodesLayer.vue b/app/src/components/NodesLayer.vue index d797b70..b4367f7 100644 --- a/app/src/components/NodesLayer.vue +++ b/app/src/components/NodesLayer.vue @@ -321,7 +321,7 @@ export default { }, editTrue(e) { - this.$emit('editTrue', e) + this.$emit('edit-true', e) // this.firstload = false // // console.log(e) }, diff --git a/app/src/components/UploadLayer.vue b/app/src/components/UploadLayer.vue index f08dec2..980bb6b 100644 --- a/app/src/components/UploadLayer.vue +++ b/app/src/components/UploadLayer.vue @@ -135,8 +135,8 @@ export default { copyHash.setSelectionRange(0, 99999) /*For mobile devices*/ document.execCommand('copy') - this.$emit('uploadAdded') - this.$emit('copyDone') + this.$emit('upload-added') + this.$emit('copy-done') }, }, } diff --git a/app/src/experimental/ModeToolbar.vue b/app/src/experimental/ModeToolbar.vue index 08c71cd..103cefc 100644 --- a/app/src/experimental/ModeToolbar.vue +++ b/app/src/experimental/ModeToolbar.vue @@ -52,21 +52,21 @@ export default { this.$store.dispatch('addNode') } if (mode == 'upload') { - this.$emit('uploadAdded') + this.$emit('upload-added') } if (mode == 'copy') { - this.$emit('copyDone') + this.$emit('copy-done') alert( 'Now all you need to do is paste into a new node to display your media' ) } if (mode == 'draw') { - this.$emit('drawOn') + this.$emit('draw-on') // console.log(mode) } if (mode != 'draw') { - this.$emit('drawOff') + this.$emit('draw-off') //console.log(mode) } }, @@ -98,7 +98,7 @@ export default { } else { // handle offline status console.log('offline') - ref.$emit('offlineTriggered') + ref.$emit('offline-triggered') } }, isReachable: function (url) { diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue index 04988a0..35e6fe6 100644 --- a/app/src/views/Cards.vue +++ b/app/src/views/Cards.vue @@ -51,8 +51,8 @@ <UploadLayer v-bind:uploadready="uploadready" v-bind:copyready="copyready" - @uploadAdded="uploadAdded()" - @copyDone="copyDone()" + @upload-added="uploadAdded()" + @copy-done="copyDone()" /> </div> <BaseButton class="new" buttonClass="action" @click="uploadAdded()" diff --git a/app/src/views/List.vue b/app/src/views/List.vue index f1db384..26d5cc0 100644 --- a/app/src/views/List.vue +++ b/app/src/views/List.vue @@ -4,7 +4,7 @@ <div id="listwrapper"> <ModesCard /> <ListLayer - @editTrue="(e) => editTrue(e)" + @edit-true="(e) => editTrue(e)" v-for="value in myNodes" v-bind:key="value.node_id" v-bind:nodeid="value.node_id" @@ -47,8 +47,8 @@ <UploadLayer v-bind:uploadready="uploadready" v-bind:copyready="copyready" - @uploadAdded="uploadAdded()" - @copyDone="copyDone()" + @upload-added="uploadAdded()" + @copy-done="copyDone()" /> </div> </div> diff --git a/app/src/views/Organise.vue b/app/src/views/Organise.vue index 6f5fad0..89de3b4 100644 --- a/app/src/views/Organise.vue +++ b/app/src/views/Organise.vue @@ -14,11 +14,11 @@ v-bind:key="value.node_id" v-bind:nodeid="value.node_id" v-bind:nodetext="value.node_text" - @editTrue="(e) => editTrue(e)" + @edit-true="(e) => editTrue(e)" /> <ModeToolbar - @offlineTriggered="offlineTriggered()" - @onlineTriggered="onlineTriggered()" + @offline-triggered="offlineTriggered()" + @online-triggered="onlineTriggered()" /> <ViewToolbar /> @@ -43,7 +43,7 @@ v-bind:deleted="value.deleted" /> <NodesLayer - @editTrue="(e) => editTrue(e)" + @edit-true="(e) => editTrue(e)" v-for="value in myNodes" v-bind:key="value.node_id" v-bind:nodeid="value.node_id" @@ -64,7 +64,7 @@ v-bind:deleted="value.deleted" /> <NodesLayer - @editTrue="(e) => editTrue(e)" + @edit-true="(e) => editTrue(e)" v-for="value in myNodes" v-bind:key="value.node_id" v-bind:nodeid="value.node_id" @@ -81,19 +81,19 @@ </PanZoomContainer> <!-- <ToolBar /> --> <ModeToolbar - @offlineTriggered="offlineTriggered()" - @onlineTriggered="onlineTriggered()" - @uploadAdded="uploadAdded()" - @copyDone="copyDone()" - @drawOn="drawOn()" - @drawOff="drawOff()" + @offline-triggered="offlineTriggered()" + @online-triggered="onlineTriggered()" + @upload-added="uploadAdded()" + @copy-done="copyDone()" + @draw-on="drawOn()" + @draw-off="drawOff()" /> <ViewToolbar /> <UploadLayer v-bind:uploadready="uploadready" v-bind:copyready="copyready" - @uploadAdded="uploadAdded()" - @copyDone="copyDone()" + @upload-added="uploadAdded()" + @copy-done="copyDone()" /> </div> </div> -- GitLab