From e266c69acd784c815f09b5f2374e6f6e28ade62c Mon Sep 17 00:00:00 2001
From: konrad <konrad@kola-entertainments.de>
Date: Mon, 15 Jun 2020 09:46:52 +0000
Subject: [PATCH] Add option to remove color from label, task, namespace or
 list (#157)

Add reset to color picker

Move all usages of verte to seperate component

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/157
---
 src/components/global/colorPicker.vue       | 59 +++++++++++++++++++++
 src/components/labels/ListLabels.vue        | 14 ++---
 src/components/lists/EditList.vue           | 14 ++---
 src/components/namespaces/EditNamespace.vue | 14 ++---
 src/components/tasks/edit-task.vue          | 15 ++----
 src/styles/components/_all.scss             |  1 +
 src/styles/components/color-picker.scss     | 15 ++++++
 src/styles/theme/theme.scss                 |  5 --
 8 files changed, 87 insertions(+), 50 deletions(-)
 create mode 100644 src/components/global/colorPicker.vue
 create mode 100644 src/styles/components/color-picker.scss

diff --git a/src/components/global/colorPicker.vue b/src/components/global/colorPicker.vue
new file mode 100644
index 000000000..c8f3c35b5
--- /dev/null
+++ b/src/components/global/colorPicker.vue
@@ -0,0 +1,59 @@
+<template>
+	<div class="color-picker-container">
+		<verte
+				v-model="color"
+				menuPosition="top"
+				picker="square"
+				model="hex"
+				:enableAlpha="false"
+				:rgbSliders="true"/>
+		<a @click="reset" class="reset">
+			Reset Color
+		</a>
+	</div>
+</template>
+
+<script>
+	import verte from 'verte'
+	import 'verte/dist/verte.css'
+
+	export default {
+		name: 'colorPicker',
+		data() {
+			return {
+				color: '',
+			}
+		},
+		components: {
+			verte,
+		},
+		props: {
+			value: {
+				required: true,
+			},
+		},
+		watch: {
+			value(newVal) {
+				this.color = newVal
+			},
+			color() {
+				this.update()
+			}
+		},
+		mounted() {
+			this.color = this.value
+		},
+		methods: {
+			update() {
+				this.$emit('input', this.color)
+				this.$emit('change')
+			},
+			reset() {
+				// FIXME: I havn't found a way to make it clear to the user the color war reset.
+				//  Not sure if verte is capable of this - it does not show the change when setting this.color = ''
+				this.color = ''
+				this.update()
+			},
+		},
+	}
+</script>
diff --git a/src/components/labels/ListLabels.vue b/src/components/labels/ListLabels.vue
index 14b011fa0..307a87957 100644
--- a/src/components/labels/ListLabels.vue
+++ b/src/components/labels/ListLabels.vue
@@ -64,14 +64,7 @@
 							<div class="field">
 								<label class="label">Color</label>
 								<div class="control">
-									<verte
-											v-model="labelEditLabel.hexColor"
-											menuPosition="top"
-											picker="square"
-											model="hex"
-											:enableAlpha="false"
-											:rgbSliders="true">
-									</verte>
+									<color-picker v-model="labelEditLabel.hexColor"/>
 								</div>
 							</div>
 							<div class="field has-addons">
@@ -100,17 +93,16 @@
 </template>
 
 <script>
-	import verte from 'verte'
-	import 'verte/dist/verte.css'
 	import {mapState} from 'vuex'
 
 	import LabelService from '../../services/label'
 	import LabelModel from '../../models/label'
+	import ColorPicker from '../global/colorPicker'
 
 	export default {
 		name: 'ListLabels',
 		components: {
-			verte,
+			ColorPicker,
 		},
 		data() {
 			return {
diff --git a/src/components/lists/EditList.vue b/src/components/lists/EditList.vue
index fee697f4b..3d507b3df 100644
--- a/src/components/lists/EditList.vue
+++ b/src/components/lists/EditList.vue
@@ -73,13 +73,7 @@
 						<div class="field">
 							<label class="label">Color</label>
 							<div class="control">
-								<verte
-										v-model="list.hexColor"
-										menuPosition="top"
-										picker="square"
-										model="hex"
-										:enableAlpha="false"
-										:rgbSliders="true"/>
+								<color-picker v-model="list.hexColor"/>
 							</div>
 						</div>
 					</form>
@@ -133,9 +127,6 @@
 </template>
 
 <script>
-	import verte from 'verte'
-	import 'verte/dist/verte.css'
-
 	import router from '../../router'
 	import manageSharing from '../sharing/userTeam'
 	import LinkSharing from '../sharing/linkSharing'
@@ -145,6 +136,7 @@
 	import Fancycheckbox from '../global/fancycheckbox'
 	import Background from './settings/background'
 	import {CURRENT_LIST} from '../../store/mutation-types'
+	import ColorPicker from '../global/colorPicker'
 
 	export default {
 		name: "EditList",
@@ -160,11 +152,11 @@
 			}
 		},
 		components: {
+			ColorPicker,
 			Background,
 			Fancycheckbox,
 			LinkSharing,
 			manageSharing,
-			verte,
 		},
 		created() {
 			this.listService = new ListService()
diff --git a/src/components/namespaces/EditNamespace.vue b/src/components/namespaces/EditNamespace.vue
index d7875acf1..859799707 100644
--- a/src/components/namespaces/EditNamespace.vue
+++ b/src/components/namespaces/EditNamespace.vue
@@ -52,13 +52,7 @@
 						<div class="field">
 							<label class="label">Color</label>
 							<div class="control">
-								<verte
-										v-model="namespace.hexColor"
-										menuPosition="top"
-										picker="square"
-										model="hex"
-										:enableAlpha="false"
-										:rgbSliders="true"/>
+								<color-picker v-model="namespace.hexColor"/>
 							</div>
 						</div>
 					</form>
@@ -108,15 +102,13 @@
 </template>
 
 <script>
-	import verte from 'verte'
-	import 'verte/dist/verte.css'
-
 	import router from '../../router'
 	import manageSharing from '../sharing/userTeam'
 
 	import NamespaceService from '../../services/namespace'
 	import NamespaceModel from '../../models/namespace'
 	import Fancycheckbox from '../global/fancycheckbox'
+	import ColorPicker from '../global/colorPicker'
 
 	export default {
 		name: "EditNamespace",
@@ -131,9 +123,9 @@
 			}
 		},
 		components: {
+			ColorPicker,
 			Fancycheckbox,
 			manageSharing,
-			verte,
 		},
 		beforeMount() {
 			this.namespace.id = this.$route.params.id
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 01981dd4d..288afab77 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -88,15 +88,7 @@
 		<div class="field">
 			<label class="label">Color</label>
 			<div class="control">
-				<verte
-						v-model="taskEditTask.hexColor"
-						menuPosition="top"
-						picker="square"
-						model="hex"
-						:enableAlpha="false"
-						:rgbSliders="true"
-						@change="editTaskSubmit()"
-				/>
+				<color-picker v-model="taskEditTask.hexColor"/>
 			</div>
 		</div>
 
@@ -142,8 +134,6 @@
 <script>
 	import flatPickr from 'vue-flatpickr-component'
 	import 'flatpickr/dist/flatpickr.css'
-	import verte from 'verte'
-	import 'verte/dist/verte.css'
 
 	import ListService from '../../services/list'
 	import TaskService from '../../services/task'
@@ -156,6 +146,7 @@
 	import RelatedTasks from './reusable/relatedTasks'
 	import RepeatAfter from './reusable/repeatAfter'
 	import Reminders from './reusable/reminders'
+	import ColorPicker from '../global/colorPicker'
 
 	export default {
 		name: 'edit-task',
@@ -181,6 +172,7 @@
 			}
 		},
 		components: {
+			ColorPicker,
 			Reminders,
 			RepeatAfter,
 			RelatedTasks,
@@ -189,7 +181,6 @@
 			PercentDoneSelect,
 			PrioritySelect,
 			flatPickr,
-			verte,
 		},
 		props: {
 			task: {
diff --git a/src/styles/components/_all.scss b/src/styles/components/_all.scss
index 96176914f..1a586e4bf 100644
--- a/src/styles/components/_all.scss
+++ b/src/styles/components/_all.scss
@@ -17,3 +17,4 @@
 @import 'kanban';
 @import 'modal';
 @import 'list-backgrounds';
+@import 'color-picker';
diff --git a/src/styles/components/color-picker.scss b/src/styles/components/color-picker.scss
new file mode 100644
index 000000000..f69638d9c
--- /dev/null
+++ b/src/styles/components/color-picker.scss
@@ -0,0 +1,15 @@
+.color-picker-container {
+  display: flex;
+  justify-content: center;
+
+  .verte__guide {
+    border-radius: 100%;
+    border: 1px solid $grey-light;
+    box-shadow: $card-shadow;
+  }
+
+  a.reset {
+    font-size: .9em;
+    padding-left: .5rem;
+  }
+}
\ No newline at end of file
diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss
index 0476ec5f0..de8f14245 100644
--- a/src/styles/theme/theme.scss
+++ b/src/styles/theme/theme.scss
@@ -61,8 +61,3 @@ button.table {
 .pagination {
   padding-bottom: 1em;
 }
-
-.verte__guide {
-  border: 2px dashed $dark;
-  border-radius: 100%;
-}