new functions

Signed-off-by: Jakob <jakob.roehrl@web.de>

src/components/board/DeletedTabSidebard.vue

@@ -1,18 +1,33 @@
 <template>
 	<div>
-		<h3>{{ t('deck', 'Deleted stacks') }}</h3>
 
+		<h3>{{ t('deck', 'Deleted stacks') }}</h3>
 		<ul>
-			<!-- <li ng-repeat="deletedStack in stackservice.deleted">
-				<span class="icon icon-deck"></span>
-				<span class="title">{{deletedStack.title}}</span>
-				<span class="live-relative-timestamp" data-timestamp="{{ deletedStack.deletedAt*1000  }}">{{deletedStack.deletedAt | relativeDateFilter }}</span>
-				<a ng-click="stackUndoDelete(deletedStack)"><span class="icon icon-history"></span></a>
-			</li> -->
+			<li v-for="deletedStack in deletedStacks" :key="deletedStack.id">
+				<span class="icon icon-deck" />
+				<span class="title">{{ deletedStack.title }}</span>
+				<span class="live-relative-timestamp" />
+				<button
+					:title="t('settings', 'Undo')"
+					class="app-navigation-entry-deleted-button icon-history"
+					@click="stackUndoDelete(deletedStack)" />
+
+					<!-- <span class="live-relative-timestamp" data-timestamp="{{ deletedStack.deletedAt*1000  }}">{{deletedStack.deletedAt | relativeDateFilter }}</span>
+				<a @click="stackUndoDelete(deletedStack)"><span class="icon icon-history"></span></a> -->
+			</li>
 		</ul>
 
 		<h3>{{ t('deck', 'Deleted cards') }}</h3>
 		<ul>
+			<li v-for="deletedCard in deletedCards" :key="deletedCard.id">
+				<div class="icon icon-deck" />
+				<span class="title">{{ deletedCard.title }}</span>
+				<button
+					:title="t('settings', 'Undo')"
+					class="app-navigation-entry-deleted-button icon-history"
+					@click="cardUndoDelete(deletedCards)" />
+			</li>
+
 			<!-- <li ng-repeat="deletedCard in cardservice.deleted">
 				<span class="icon icon-deck"></span>
 				<span class="title">{{deletedCard.title}} ({{stackservice.tryAllThenDeleted(deletedCard.stackId).title}})</span>
@@ -40,13 +55,16 @@ export default {
 	},
 	data() {
 		return {
-			isLoading: false
+			isLoading: false,
+			copiedDeletedStack: null,
+			copiedDeletedCard: null
 		}
 	},
 	computed: {
 		...mapState({
-			deletedStacks: state => state.deletedStacks
-			// deletedCards: state => state.deletedCards
+			deletedStacks: state => state.stack.deletedStacks,
+			deletedCards: state => state.stack.deletedCards,
+			currentBoard: state => state.currentBoard
 		})
 
 	},
@@ -56,10 +74,19 @@ export default {
 	methods: {
 		getData() {
 			this.isLoading = true
-
-			this.$store.dispatch('deletedItems', 1).then(response => {
+			this.$store.dispatch('deletedItems', this.currentBoard.id).then(response => {
 				this.isLoading = false
 			})
+		},
+		stackUndoDelete(deletedStack) {
+			this.copiedDeletedStack = Object.assign({}, deletedStack)
+			this.copiedDeletedStack.deletedAt = 0
+			this.$store.dispatch('stackUndoDelete', this.copiedDeletedStack)
+		},
+		cardUndoDelete(deletedCard) {
+			this.copiedDeletedCard = Object.assign({}, deletedCard)
+			this.copiedDeletedCard.deletedAt = 0
+			this.$store.dispatch('cardUndoDelete', this.copiedDeletedCard)
 		}
 	}
 }
@@ -81,4 +108,20 @@ export default {
 			flex-grow: 1;
 		}
 	}
+
+	li {
+	display: flex;
+	flex-direction: row;
+
+	* {
+		flex-basis: 44px;
+	}
+
+	.title {
+		flex-grow: 2;
+	}
+	.live-relative-timestamp {
+		flex-grow: 1;
+	}
+}
 </style>

src/components/board/Stack.vue

@@ -23,7 +23,7 @@
 
 <template>
 	<div>
-
+		order: {{ stack.order }}
 		<h3 v-if="!editing" @click="startEditing(stack)">{{ stack.title }}
 			<button v-tooltip="t('deck', 'Delete')" class="icon-delete"
 				@click="deleteStack(stack)" />
@@ -38,7 +38,8 @@
 			</div>
 		</transition>
 
-		<container :get-child-payload="payloadForCard(stack.id)" group-name="stack" @drop="($event) => onDropCard(stack.id, $event)">
+		<!-- <container :get-child-payload="payloadForCard(stack.id)" group-name="stack" @drop="($event) => onDropCard(stack.id, $event)"> -->
+		<container :get-child-payload="payloadForCard(stack.id)" group-name="stack" @drop="onDropCard">
 			<draggable v-for="card in cardsByStack(stack.id)" :key="card.id">
 				<card-item v-if="card" :id="card.id" />
 			</draggable>
@@ -93,7 +94,6 @@ export default {
 	methods: {
 
 		onDropCard({ removedIndex, addedIndex }) {
-
 		},
 		payloadForCard(stackId) {
 			return index => {