From 3f272b91c6581a6ba8c8563d4e4b2f53c0e0d171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Fri, 26 Apr 2019 11:37:34 +0200
Subject: [PATCH] some small changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 src/components/board/Board.vue               |  4 +-
 src/components/board/BoardSidebar.vue        |  2 +-
 src/components/board/DeletedTabSidebard.vue  | 20 +++---
 src/components/board/SharingTabSidebard.vue  | 68 ++++++++++----------
 src/components/board/TagsTabSidebard.vue     | 65 +++++++++++--------
 src/components/board/TimelineTabSidebard.vue | 20 +++---
 src/mixins/color.js                          |  9 +++
 src/models/index.js                          |  2 +-
 src/services/BoardApi.js                     | 60 ++++++++---------
 src/store/main.js                            | 18 +++---
 10 files changed, 140 insertions(+), 128 deletions(-)

diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue
index ecd280b0f..fe01fec5f 100644
--- a/src/components/board/Board.vue
+++ b/src/components/board/Board.vue
@@ -103,8 +103,8 @@ export default {
 					this.$store.dispatch('setCurrentBoard', board)
 					this.$store.dispatch('loadStacks', board)
 					this.loading = false
-					console.log(board);
-					this.$store.state.labels = board.labels;
+					console.log(board)
+					this.$store.state.labels = board.labels
 				})
 		},
 		onDropStack({ removedIndex, addedIndex }) {
diff --git a/src/components/board/BoardSidebar.vue b/src/components/board/BoardSidebar.vue
index 8776c11af..9744131fa 100644
--- a/src/components/board/BoardSidebar.vue
+++ b/src/components/board/BoardSidebar.vue
@@ -36,7 +36,7 @@
 			<div class="tabsContainer">
 				<div class="tab">
 					<div v-if="activeTab === 'Sharing'">
-						<SharingTabSidebard :board="board"></SharingTabSidebard>
+						<SharingTabSidebard :board="board" />
 					</div>
 
 					<div
diff --git a/src/components/board/DeletedTabSidebard.vue b/src/components/board/DeletedTabSidebard.vue
index 53cb75191..eb4076b14 100644
--- a/src/components/board/DeletedTabSidebard.vue
+++ b/src/components/board/DeletedTabSidebard.vue
@@ -1,7 +1,7 @@
 <template>
-		<div>
-			deleted
-		</div>
+	<div>
+		deleted
+	</div>
 </template>
 
 <script>
@@ -9,20 +9,18 @@
 export default {
 	name: 'DeletedTabSidebard',
 	components: {
-		
-	},
-	props: {
-	},
-	data() {
-		return {
-		}
+
 	},
 	props: {
 		board: {
 			type: Object,
 			default: undefined
 		}
+	},
+	data() {
+		return {
+		}
 	}
-		
+
 }
 </script>
diff --git a/src/components/board/SharingTabSidebard.vue b/src/components/board/SharingTabSidebard.vue
index 871a3bc4d..da5e75e36 100644
--- a/src/components/board/SharingTabSidebard.vue
+++ b/src/components/board/SharingTabSidebard.vue
@@ -1,29 +1,29 @@
 <template>
-		<div>
-			<multiselect :options="sharees" @search-change="asyncFind" label="label">
-				<template #option="scope">
-					{{ scope.option.label }}
-				</template>
-			</multiselect>
+	<div>
+		<multiselect :options="sharees" label="label" @search-change="asyncFind">
+			<template #option="scope">
+				{{ scope.option.label }}
+			</template>
+		</multiselect>
 
-			<ul
-				id="shareWithList"
-				class="shareWithList"
-			>
-				<li>
-					<avatar :user="board.owner.uid" />
-					<span class="has-tooltip username">
-						{{ board.owner.displayname }}
-					</span>
-				</li>
-				<li v-for="acl in board.acl" :key="acl.participant.uid">
-					<avatar :user="acl.participant.uid" />
-					<span class="has-tooltip username">
-						{{ acl.participant.displayname }}
-					</span>
-				</li>
-			</ul>
-		</div>
+		<ul
+			id="shareWithList"
+			class="shareWithList"
+		>
+			<li>
+				<avatar :user="board.owner.uid" />
+				<span class="has-tooltip username">
+					{{ board.owner.displayname }}
+				</span>
+			</li>
+			<li v-for="acl in board.acl" :key="acl.participant.uid">
+				<avatar :user="acl.participant.uid" />
+				<span class="has-tooltip username">
+					{{ acl.participant.displayname }}
+				</span>
+			</li>
+		</ul>
+	</div>
 </template>
 
 <script>
@@ -34,7 +34,13 @@ export default {
 	name: 'SharingTabSidebard',
 	components: {
 		Avatar,
-		Multiselect,
+		Multiselect
+	},
+	props: {
+		board: {
+			type: Object,
+			default: undefined
+		}
 	},
 	data() {
 		return {
@@ -46,22 +52,14 @@ export default {
 			sharees: 'sharees'
 		})
 	},
-	props: {
-		board: {
-			type: Object,
-			default: undefined
-		}
-	},
 	methods: {
-		asyncFind (query) {
+		asyncFind(query) {
 			this.isLoading = true
 			this.$store.dispatch('loadSharees').then(response => {
 				this.isLoading = false
 			})
-		},
+		}
 	}
 
-
-
 }
 </script>
diff --git a/src/components/board/TagsTabSidebard.vue b/src/components/board/TagsTabSidebard.vue
index defb2707e..f5d0891ee 100644
--- a/src/components/board/TagsTabSidebard.vue
+++ b/src/components/board/TagsTabSidebard.vue
@@ -4,28 +4,28 @@
 			<li v-for="label in labels" :key="label.id">
 				<template v-if="editingLabelId === label.id">
 					<input v-model="editingLabel.title">
-					<compact-picker :value=editingLabel.color @input="updateColor" :palette=defaultColors></compact-picker>
-					<button class="icon-checkmark" @click="updateLabel(label)" :disabled="!editLabelObjValidated" 
-					v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }" />
+					<compact-picker :value="editingLabel.color" :palette="defaultColors" @input="updateColor" />
+					<button v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }" :disabled="!editLabelObjValidated" class="icon-checkmark"
+						@click="updateLabel(label)" />
 
 					<button v-tooltip="t('deck', 'Cancel')" class="icon-close" @click="editingLabelId = null" />
 				</template>
 				<template v-else>
 					<span :style="{ backgroundColor: `#${label.color}`, color:textColor(label.color) }" class="label-title">
-						<span v-if="label.title">{{ label.title }}</span><i v-if="!label.title"><br></i>
+						<span>{{ label.title }}</span>
 					</span>
-					 <button v-tooltip="t('deck', 'Edit')" class="icon-rename" @click="clickEdit(label)" />
+					<button v-tooltip="t('deck', 'Edit')" class="icon-rename" @click="clickEdit(label)" />
 					<button v-tooltip="t('deck', 'Delete')" class="icon-delete" @click="deleteLabel(label.id)" />
 				</template>
 			</li>
-			
+
 			<li v-if="addLabel">
 				<template>
-				<input v-model="addLabelObj.title">
-				<compact-picker value="#fff" @input="updateColor" :palette=defaultColors></compact-picker>
-				<button class="icon-checkmark" @click="clickAddLabel()" :disabled="!addLabelObjValidated" 
-					v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }" />
-				<button v-tooltip="t('deck', 'Cancel')" class="icon-close" @click="addLabel=false" />
+					<input v-model="addLabelObj.title">
+					<compact-picker :palette="defaultColors" value="" @input="updateColor" />
+					<button v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }" :disabled="!addLabelObjValidated" class="icon-checkmark"
+						@click="clickAddLabel()" />
+					<button v-tooltip="t('deck', 'Cancel')" class="icon-close" @click="addLabel=false" />
 				</template>
 			</li>
 			<button v-tooltip="t('deck', 'Add')" class="icon-add" @click="clickShowAddLabel()" />
@@ -41,10 +41,10 @@ import { Compact } from 'vue-color'
 
 export default {
 	name: 'TagsTabSidebard',
-	mixins: [Color],
 	components: {
 		'compact-picker': Compact
 	},
+	mixins: [Color],
 	data() {
 		return {
 			editingLabelId: null,
@@ -58,28 +58,37 @@ export default {
 	computed: {
 		...mapGetters({
 			labels: 'currentBoardLabels'
-		}), 
+		}),
 		addLabelObjValidated() {
-			if (this.addLabelObj.title == '') return false;
-			if (this.addLabelObj.color == '' || 
-			this.addLabelObj.color.length != 6) return false;
-			return true;
+			if (this.addLabelObj.title === '') {
+				return false
+			}
+
+			if (this.colorIsValid(this.addLabelObj.color) === false) {
+				return false
+			}
+
+			return true
 		},
 		editLabelObjValidated() {
-			console.log(this.editingLabel.color)
-			if (this.editingLabel.title == '') return false;
-			if (this.editingLabel.color == '' || 
-			this.editingLabel.color.length != 6) return false;
-			return true;
+			if (this.editingLabel.title === '') {
+				return false
+			}
+
+			if (this.colorIsValid(this.editingLabel.color) === false) {
+				return false
+			}
+
+			return true
 		}
-		
+
 	},
 	methods: {
 		updateColor(c) {
-			if (this.editingLabel == null) {
-				this.addLabelObj.color = c.hex.substring(1,7)
+			if (this.editingLabel === null) {
+				this.addLabelObj.color = c.hex.substring(1, 7)
 			} else {
-				this.editingLabel.color = c.hex.substring(1,7)
+				this.editingLabel.color = c.hex.substring(1, 7)
 			}
 		},
 		clickEdit(label) {
@@ -94,8 +103,8 @@ export default {
 			this.editingLabelId = null
 		},
 		clickShowAddLabel() {
-			this.addLabelObj = { cardId: null, color: '000', title: ''}
-			this.addLabel=true
+			this.addLabelObj = { cardId: null, color: '000', title: '' }
+			this.addLabel = true
 		},
 		clickAddLabel() {
 			this.$store.dispatch('addLabelToCurrentBoard', this.addLabelObj)
diff --git a/src/components/board/TimelineTabSidebard.vue b/src/components/board/TimelineTabSidebard.vue
index cd5548a68..ff9cd5526 100644
--- a/src/components/board/TimelineTabSidebard.vue
+++ b/src/components/board/TimelineTabSidebard.vue
@@ -1,7 +1,7 @@
 <template>
-		<div>
-			timeline
-		</div>
+	<div>
+		timeline
+	</div>
 </template>
 
 <script>
@@ -9,20 +9,18 @@
 export default {
 	name: 'TimelineTabSidebard',
 	components: {
-		
-	},
-	props: {
-	},
-	data() {
-		return {
-		}
+
 	},
 	props: {
 		board: {
 			type: Object,
 			default: undefined
 		}
+	},
+	data() {
+		return {
+		}
 	}
-		
+
 }
 </script>
diff --git a/src/mixins/color.js b/src/mixins/color.js
index 43d2b5cf2..fbc90580a 100644
--- a/src/mixins/color.js
+++ b/src/mixins/color.js
@@ -81,6 +81,15 @@ export default {
 				return '#000000'
 			}
 
+		},
+		colorIsValid(hex) {
+
+			var re = new RegExp('[A-Fa-f0-9]{6}')
+			if (re.test(hex)) {
+				return true
+			}
+			return false
+
 		}
 
 	}
diff --git a/src/models/index.js b/src/models/index.js
index 4684a3faf..10da0feee 100644
--- a/src/models/index.js
+++ b/src/models/index.js
@@ -52,4 +52,4 @@
  * @typedef {Object} Label
  * @property {String} title
  * @property {String} color
- */
\ No newline at end of file
+ */
diff --git a/src/services/BoardApi.js b/src/services/BoardApi.js
index fbfc699c0..8f8efb23f 100644
--- a/src/services/BoardApi.js
+++ b/src/services/BoardApi.js
@@ -138,47 +138,47 @@ export class BoardApi {
 	// Label API Calls
 	deleteLabel(id) {
 		return axios.delete(this.url(`/labels/${id}`))
-		.then(
-			(response) => {
-				return Promise.resolve(response.data)
-			},
-			(err) => {
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				}
+			)
+			.catch((err) => {
 				return Promise.reject(err)
-			}
-		)
-		.catch((err) => {
-			return Promise.reject(err)
-		})
+			})
 	}
 
 	updateLabel(label) {
 		return axios.put(this.url(`/labels/${label.id}`), label)
-		.then(
-			(response) => {
-				return Promise.resolve(response.data)
-			},
-			(err) => {
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				}
+			)
+			.catch((err) => {
 				return Promise.reject(err)
-			}
-		)
-		.catch((err) => {
-			return Promise.reject(err)
-		})
+			})
 	}
 
 	createLabel(labelData) {
 		return axios.post(this.url('/labels'), labelData)
-		.then(
-			(response) => {
-				return Promise.resolve(response.data)
-			},
-			(err) => {
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				}
+			)
+			.catch((err) => {
 				return Promise.reject(err)
-			}
-		)
-		.catch((err) => {
-			return Promise.reject(err)
-		})
+			})
 	}
 
 }
diff --git a/src/store/main.js b/src/store/main.js
index 0688aa2b1..1cb946e12 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -245,22 +245,22 @@ export default new Vuex.Store({
 		// label actions
 		removeLabelFromCurrentBoard({ commit }, label) {
 			apiClient.deleteLabel(label)
-			.then((label) => {
-				commit('removeLabelFromCurrentBoard', label.id);
-			})
+				.then((label) => {
+					commit('removeLabelFromCurrentBoard', label.id)
+				})
 		},
 		updateLabelFromCurrentBoard({ commit }, newLabel) {
 			apiClient.updateLabel(newLabel)
-			.then((newLabel) => {
-				commit('updateLabelFromCurrentBoard', newLabel);
-			})
+				.then((newLabel) => {
+					commit('updateLabelFromCurrentBoard', newLabel)
+				})
 		},
 		addLabelToCurrentBoard({ commit }, newLabel) {
 			newLabel.boardId = this.state.currentBoard.id
 			apiClient.createLabel(newLabel)
-			.then((newLabel) => {
-				commit('addLabelToCurrentBoard', newLabel);
-			})
+				.then((newLabel) => {
+					commit('addLabelToCurrentBoard', newLabel)
+				})
 		}
 	}
 })