diff --git a/CHANGELOG.md b/CHANGELOG.md index e315720e6bfb165bea5fd4a505c98cc22fe3d3c6..192918ed2f816a1dd563275674a6e51e7e16d15e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ _30th October 2020_ - Collect mode welcome/ explainer node - You are now warned before you discard a node +- Basic upload and get upload to Collect mode ### Changed diff --git a/app/src/components/OnBoard.vue b/app/src/components/OnBoard.vue index 680acb3c53d3ce55bc7da17e831f8d8c6596dec4..4e1f83693f044e152832acdfc9086e9302308624 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 == 'Home'"> + <div v-if="this.currentroute.name == 'Organise'"> <vue-draggable-resizable class="innernode" :w="300" diff --git a/app/src/views/List.vue b/app/src/views/List.vue index ed3581c60b5ad5412e892243d46b2b27f2058bbf..f4ee7625befd2c8ca7463204f8e7fd9e668895c4 100644 --- a/app/src/views/List.vue +++ b/app/src/views/List.vue @@ -36,21 +36,22 @@ <line class="c" x2="41" transform="translate(1406.5 884.5)" /> <line class="c" y2="41" transform="translate(1426.5 863.5)" /> </g> + </svg> - <!-- <BaseButton class="new" buttonClass="action" @click="uploadAdded()" + <BaseButton class="new" buttonClass="action" @click="uploadAdded()" >Upload</BaseButton > <BaseButton class="new" buttonClass="action" @click="copyDone()" - >Download</BaseButton - > --> + >Get Upload</BaseButton + > </div> - <!-- <UploadLayer + <UploadLayer v-bind:uploadready="uploadready" v-bind:copyready="copyready" @uploadAdded="uploadAdded()" @copyDone="copyDone()" - /> --> + /> </div> </div> <div v-else> @@ -62,7 +63,7 @@ <script> import ListLayer from '@/components/ListLayer' import ModesCard from '@/components/ModesCard' -// import UploadLayer from '@/components/UploadLayer' +import UploadLayer from '@/components/UploadLayer' import OnBoard from '@/components/OnBoard' import { mapState } from 'vuex' @@ -137,7 +138,7 @@ export default { ModesCard, ListLayer, OnBoard, - // UploadLayer, + UploadLayer, }, } </script> @@ -157,6 +158,7 @@ export default { font-size: 1em; } .new { + margin-left: 1em; margin-bottom: 1em; }