From 5b4680edfd536bfa078368b3505f26104aec93af Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Fri, 30 Oct 2020 16:55:35 +0000
Subject: [PATCH] update to 0.1.31
---
CHANGELOG.md | 1 +
app/src/components/OnBoard.vue | 2 +-
app/src/views/List.vue | 16 +++++++++-------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e315720..192918e 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 680acb3..4e1f836 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 ed3581c..f4ee762 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;
}
--
GitLab