From 452f49c17c199e222ec44d5eff4bd2de2450061c Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Fri, 13 Sep 2019 09:51:16 +0200
Subject: [PATCH 1/6] boards are shown in model

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 42 ++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 8012b1901..1eccefdb5 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -37,9 +37,18 @@
 					<ActionButton icon="icon-archive" @click="archiveUnarchiveCard()">{{ t('deck', (showArchived ? 'Unarchive card' : 'Archive card')) }}</ActionButton>
 					<ActionButton v-if="showArchived === false" icon="icon-delete" @click="deleteCard()">{{ t('deck', 'Delete card') }}</ActionButton>
 					<ActionButton icon="icon-settings-dark" @click="openCard">{{ t('deck', 'Card details') }}</ActionButton>
+					<ActionButton icon="icon-settings-dark" @click.stop="modalShow=true">{{ t('deck', 'Move card') }}</ActionButton>
 				</Actions>
 
 			</transition>
+			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
+				<div class="modal__content">
+					<Multiselect v-model="selectedBoard" :options="boards" label="title" />
+					{{ stacksBySelectedBoard }}
+
+				</div>
+			</modal>
+
 		</div>
 		<ul class="labels" @click="openCard">
 			<li v-for="label in card.labels" :key="label.id" :style="labelStyle(label)"><span>{{ label.title }}</span></li>
@@ -51,9 +60,10 @@
 </template>
 
 <script>
-import { PopoverMenu } from 'nextcloud-vue'
+import { Modal } from 'nextcloud-vue/dist/Components/Modal'
 import { Actions } from 'nextcloud-vue/dist/Components/Actions'
 import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
+import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
 import ClickOutside from 'vue-click-outside'
 import { mapState } from 'vuex'
 
@@ -63,7 +73,7 @@ import Color from '../../mixins/color'
 
 export default {
 	name: 'CardItem',
-	components: { PopoverMenu, CardBadges, LabelTag, Actions, ActionButton },
+	components: { Modal, CardBadges, LabelTag, Actions, ActionButton, Multiselect },
 	directives: {
 		ClickOutside
 	},
@@ -78,17 +88,32 @@ export default {
 		return {
 			menuOpened: false,
 			editing: false,
-			copiedCard: ''
+			copiedCard: '',
+			modalShow: false,
+			selectedBoard: '',
+			selectedStack: ''
 		}
 	},
 	computed: {
 		...mapState({
 			compactMode: state => state.compactMode,
-			showArchived: state => state.showArchived
+			showArchived: state => state.showArchived,
+			currentBoard: state => state.currentBoard
 		}),
 		card() {
 			return this.$store.getters.cardById(this.id)
 		},
+		boards() {
+			return this.$store.getters.boards.filter(board => {
+				return board.id !== this.currentBoard.id
+			})
+		},
+		stacksBySelectedBoard() {
+			if (this.selectedBoard === '') {
+				return []
+			}
+			return this.$store.getters.stacksByBoard(this.selectedBoard.id)
+		},
 		menu() {
 			return []
 		},
@@ -136,6 +161,9 @@ export default {
 			this.copiedCard = Object.assign({}, this.card)
 			this.copiedCard.newUserUid = this.card.owner.uid
 			this.$store.dispatch('assignCardToUser', this.copiedCard)
+		},
+		moveCard() {
+
 		}
 	}
 }
@@ -248,4 +276,10 @@ export default {
 			color: transparent;
 		}
 	}
+
+	.modal__content {
+		width: 50vw;
+		text-align: center;
+		margin: 10vw 0;
+	}
 </style>

From 27b8c79bcab7c871f747ef89488cf9bb3c1196dd Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Tue, 17 Sep 2019 14:26:46 +0200
Subject: [PATCH 2/6] stack api call

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 1eccefdb5..951eebf3c 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -44,6 +44,8 @@
 			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
 				<div class="modal__content">
 					<Multiselect v-model="selectedBoard" :options="boards" label="title" />
+					<Multiselect v-model="selectedStack" :options="stacksBySelectedBoard" label="title" />
+
 					{{ stacksBySelectedBoard }}
 
 				</div>
@@ -66,6 +68,7 @@ import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
 import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
 import ClickOutside from 'vue-click-outside'
 import { mapState } from 'vuex'
+import axios from 'nextcloud-axios'
 
 import CardBadges from './CardBadges'
 import LabelTag from './LabelTag'
@@ -112,7 +115,22 @@ export default {
 			if (this.selectedBoard === '') {
 				return []
 			}
-			return this.$store.getters.stacksByBoard(this.selectedBoard.id)
+
+			let url = OC.generateUrl('/apps/deck/stacks/' + this.selectedBoard.id)
+			axios.get(url)
+				.then(
+					(response) => {
+						return Promise.resolve(response.data)
+					},
+					(err) => {
+						return Promise.reject(err)
+					}
+				)
+				.catch((err) => {
+					return Promise.reject(err)
+				}).then((result) => {
+					return result
+				})
 		},
 		menu() {
 			return []

From 7d393292f3b42d1b50d32d0c23aa50cbee7442f2 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Wed, 9 Oct 2019 13:40:12 +0200
Subject: [PATCH 3/6] stacks are not shown

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 34 +++++++++----------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 951eebf3c..bb7cc39bd 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -44,9 +44,7 @@
 			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
 				<div class="modal__content">
 					<Multiselect v-model="selectedBoard" :options="boards" label="title" />
-					<Multiselect v-model="selectedStack" :options="stacksBySelectedBoard" label="title" />
-
-					{{ stacksBySelectedBoard }}
+					<Multiselect v-model="selectedStack" :options="asyncFindStacks" label="title" />
 
 				</div>
 			</modal>
@@ -111,27 +109,6 @@ export default {
 				return board.id !== this.currentBoard.id
 			})
 		},
-		stacksBySelectedBoard() {
-			if (this.selectedBoard === '') {
-				return []
-			}
-
-			let url = OC.generateUrl('/apps/deck/stacks/' + this.selectedBoard.id)
-			axios.get(url)
-				.then(
-					(response) => {
-						return Promise.resolve(response.data)
-					},
-					(err) => {
-						return Promise.reject(err)
-					}
-				)
-				.catch((err) => {
-					return Promise.reject(err)
-				}).then((result) => {
-					return result
-				})
-		},
 		menu() {
 			return []
 		},
@@ -180,6 +157,15 @@ export default {
 			this.copiedCard.newUserUid = this.card.owner.uid
 			this.$store.dispatch('assignCardToUser', this.copiedCard)
 		},
+		async asyncFindStacks() {
+			try {
+				let url = OC.generateUrl('/apps/deck/stacks/' + this.selectedBoard.id)
+				let response = await axios.get(url)
+				return response.data
+			} catch (err) {
+				return err
+			}
+		},
 		moveCard() {
 
 		}

From e69b5465bdc7fc0b4c1b7fd48179ac507b50e300 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Wed, 9 Oct 2019 21:56:24 +0200
Subject: [PATCH 4/6] done

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 25 ++++++++++++++++++-------
 src/store/card.js                 |  6 ++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index bb7cc39bd..ce84347b8 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -43,8 +43,15 @@
 			</transition>
 			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
 				<div class="modal__content">
-					<Multiselect v-model="selectedBoard" :options="boards" label="title" />
-					<Multiselect v-model="selectedStack" :options="asyncFindStacks" label="title" />
+					<Multiselect v-model="selectedBoard" :options="boards" label="title"
+						@select="loadStacksFromBoard" />
+					<Multiselect v-model="selectedStack" :options="stacksFromBoard" label="title" />
+					<button @click="moveCard">
+						<span class="icon-confirm" />{{ t('deck', 'Move card') }}
+					</button>
+					<button @click="modalShow=false">
+						<span class="icon-cancel" />{{ t('deck', 'Cancel') }}
+					</button>
 
 				</div>
 			</modal>
@@ -92,7 +99,8 @@ export default {
 			copiedCard: '',
 			modalShow: false,
 			selectedBoard: '',
-			selectedStack: ''
+			selectedStack: '',
+			stacksFromBoard: []
 		}
 	},
 	computed: {
@@ -157,17 +165,20 @@ export default {
 			this.copiedCard.newUserUid = this.card.owner.uid
 			this.$store.dispatch('assignCardToUser', this.copiedCard)
 		},
-		async asyncFindStacks() {
+		async loadStacksFromBoard(board) {
 			try {
-				let url = OC.generateUrl('/apps/deck/stacks/' + this.selectedBoard.id)
+				let url = OC.generateUrl('/apps/deck/stacks/' + board.id)
 				let response = await axios.get(url)
-				return response.data
+				this.stacksFromBoard = response.data
 			} catch (err) {
 				return err
 			}
 		},
 		moveCard() {
-
+			this.copiedCard = Object.assign({}, this.card)
+			this.copiedCard.stackId = this.selectedStack.id
+			this.$store.dispatch('moveCard', this.copiedCard)
+			this.modalShow = false
 		}
 	}
 }
diff --git a/src/store/card.js b/src/store/card.js
index 94b31388e..d6268f406 100644
--- a/src/store/card.js
+++ b/src/store/card.js
@@ -116,6 +116,12 @@ export default {
 					commit('updateTitle', updatedCard)
 				})
 		},
+		moveCard({ commit }, card) {
+			apiClient.updateCard(card)
+				.then((updatedCard) => {
+					commit('deleteCard', updatedCard)
+				})
+		},
 		reorderCard({ commit }, card) {
 			commit('updateCard', card)
 			// TODO iterate over cards in stacks and increase order state from cards >= card.order

From 0f2e735a207e0e5057f39bf0ad83ca0021dfe8bc Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Thu, 10 Oct 2019 11:06:51 +0200
Subject: [PATCH 5/6] some UI changes

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index ce84347b8..35c13db38 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -36,22 +36,21 @@
 					<ActionButton v-if="showArchived === false" icon="icon-user" @click="assignCardToMe()">{{ t('deck', 'Assign to me') }}</ActionButton>
 					<ActionButton icon="icon-archive" @click="archiveUnarchiveCard()">{{ t('deck', (showArchived ? 'Unarchive card' : 'Archive card')) }}</ActionButton>
 					<ActionButton v-if="showArchived === false" icon="icon-delete" @click="deleteCard()">{{ t('deck', 'Delete card') }}</ActionButton>
+					<ActionButton icon="icon-external" @click.stop="modalShow=true">{{ t('deck', 'Move card') }}</ActionButton>
 					<ActionButton icon="icon-settings-dark" @click="openCard">{{ t('deck', 'Card details') }}</ActionButton>
-					<ActionButton icon="icon-settings-dark" @click.stop="modalShow=true">{{ t('deck', 'Move card') }}</ActionButton>
 				</Actions>
 
 			</transition>
 			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
 				<div class="modal__content">
-					<Multiselect v-model="selectedBoard" :options="boards" label="title"
+					<Multiselect :placeholder="t('deck', 'select board')" v-model="selectedBoard" :options="boards"
+						label="title"
 						@select="loadStacksFromBoard" />
-					<Multiselect v-model="selectedStack" :options="stacksFromBoard" label="title" />
-					<button @click="moveCard">
-						<span class="icon-confirm" />{{ t('deck', 'Move card') }}
-					</button>
-					<button @click="modalShow=false">
-						<span class="icon-cancel" />{{ t('deck', 'Cancel') }}
-					</button>
+					<Multiselect :placeholder="t('deck', 'select stack')" v-model="selectedStack" :options="stacksFromBoard"
+						label="title" />
+
+					<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">{{ t('deck', 'Move card') }}</button>
+					<button @click="modalShow=false">{{ t('deck', 'Cancel') }}</button>
 
 				</div>
 			</modal>
@@ -130,6 +129,12 @@ export default {
 		},
 		currentCard() {
 			return this.$route.params.cardId === this.id
+		},
+		isBoardAndStackChoosen() {
+			if (this.selectedBoard === '' || this.selectedStack === '') {
+				return false
+			}
+			return true
 		}
 	},
 	methods: {
@@ -293,8 +298,11 @@ export default {
 	}
 
 	.modal__content {
-		width: 50vw;
+		width: 25vw;
 		text-align: center;
-		margin: 10vw 0;
+		margin: 4vw 1vw;
+	}
+	.modal__content button{
+		float: right;
 	}
 </style>

From a6bdf077ffd5f3ee92dd9b17f2c694dd458a036c Mon Sep 17 00:00:00 2001
From: Jakob <jakob.roehrl@web.de>
Date: Fri, 11 Oct 2019 07:25:08 +0200
Subject: [PATCH 6/6] some css changes

Signed-off-by: Jakob <jakob.roehrl@web.de>
---
 src/components/cards/CardItem.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 35c13db38..fc0000950 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -43,10 +43,10 @@
 			</transition>
 			<modal v-if="modalShow" title="Move card to another board" @close="modalShow=false">
 				<div class="modal__content">
-					<Multiselect :placeholder="t('deck', 'select board')" v-model="selectedBoard" :options="boards"
+					<Multiselect :placeholder="t('deck', 'Select a board')" v-model="selectedBoard" :options="boards"
 						label="title"
 						@select="loadStacksFromBoard" />
-					<Multiselect :placeholder="t('deck', 'select stack')" v-model="selectedStack" :options="stacksFromBoard"
+					<Multiselect :placeholder="t('deck', 'Select a stack')" v-model="selectedStack" :options="stacksFromBoard"
 						label="title" />
 
 					<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">{{ t('deck', 'Move card') }}</button>
@@ -299,10 +299,17 @@ export default {
 
 	.modal__content {
 		width: 25vw;
+		min-width: 250px;
+		height: 120px;
 		text-align: center;
-		margin: 4vw 1vw;
+		margin: 20px 20px 60px 20px;
+
+		.multiselect {
+			margin-bottom: 10px;
+		}
 	}
-	.modal__content button{
+
+	.modal__content button {
 		float: right;
 	}
 </style>