From cafb960c8d53495ec81ec6b0d961b591b718b510 Mon Sep 17 00:00:00 2001
From: konrad <konrad@kola-entertainments.de>
Date: Wed, 25 Mar 2020 21:27:29 +0000
Subject: [PATCH] Colors for lists and namespaces (#74)

Show colors for namespaces bigger

Show colors for lists and namespaces

Add changing color for lists

Add changing color for namespace

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/74
---
 src/App.vue                                 |  8 ++++++--
 src/components/lists/EditList.vue           | 16 +++++++++++++++
 src/components/namespaces/EditNamespace.vue | 16 +++++++++++++++
 src/models/list.js                          |  7 ++++++-
 src/models/namespace.js                     |  5 +++++
 src/services/list.js                        |  6 ++++++
 src/services/namespace.js                   | 10 ++++++++++
 src/styles/theme/navigation.scss            | 22 ++++++++++++++++++---
 8 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a576618b8..1588ec930 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -134,7 +134,8 @@
 										</span>
 									</router-link>
 									<label class="menu-label" v-tooltip="n.name + ' (' + n.lists.length + ')'" :for="n.id + 'checker'">
-										<span>
+										<span class="name">
+											<span class="color-bubble" v-if="n.hex_color !== ''" :style="{ backgroundColor: n.hex_color }"></span>
 											{{n.name}} ({{n.lists.length}})
 										</span>
 										<span class="is-archived" v-if="n.is_archived">
@@ -147,7 +148,10 @@
 									<ul class="menu-list can-be-hidden" >
 										<li v-for="l in n.lists" :key="l.id">
 											<router-link :to="{ name: 'showList', params: { id: l.id} }">
-												<span>{{l.title}}</span>
+												<span class="name">
+													<span class="color-bubble" v-if="l.hex_color !== ''" :style="{ backgroundColor: l.hex_color }"></span>
+													{{l.title}}
+												</span>
 												<span class="is-archived" v-if="l.is_archived">
 													Archived
 												</span>
diff --git a/src/components/lists/EditList.vue b/src/components/lists/EditList.vue
index 88b705ab6..9e4e32f2b 100644
--- a/src/components/lists/EditList.vue
+++ b/src/components/lists/EditList.vue
@@ -34,6 +34,18 @@
 								</label>
 							</div>
 						</div>
+						<div class="field">
+							<label class="label">Color</label>
+							<div class="control">
+								<verte
+										v-model="list.hex_color"
+										menuPosition="top"
+										picker="square"
+										model="hex"
+										:enableAlpha="false"
+										:rgbSliders="true"/>
+							</div>
+						</div>
 					</form>
 
 					<div class="columns bigbuttons">
@@ -71,6 +83,9 @@
 </template>
 
 <script>
+	import verte from 'verte'
+	import 'verte/dist/verte.css'
+
 	import auth from '../../auth'
 	import router from '../../router'
 	import manageSharing from '../sharing/userTeam'
@@ -97,6 +112,7 @@
 		components: {
 			LinkSharing,
 			manageSharing,
+			verte,
 		},
 		beforeMount() {
 			// Check if the user is already logged in, if so, redirect him to the homepage
diff --git a/src/components/namespaces/EditNamespace.vue b/src/components/namespaces/EditNamespace.vue
index 942d9fd7f..573dafcbb 100644
--- a/src/components/namespaces/EditNamespace.vue
+++ b/src/components/namespaces/EditNamespace.vue
@@ -42,6 +42,18 @@
 								</div>
 							</div>
 						</div>
+						<div class="field">
+							<label class="label">Color</label>
+							<div class="control">
+								<verte
+										v-model="namespace.hex_color"
+										menuPosition="top"
+										picker="square"
+										model="hex"
+										:enableAlpha="false"
+										:rgbSliders="true"/>
+							</div>
+						</div>
 					</form>
 
 					<div class="columns bigbuttons">
@@ -77,6 +89,9 @@
 </template>
 
 <script>
+	import verte from 'verte'
+	import 'verte/dist/verte.css'
+
 	import auth from '../../auth'
 	import router from '../../router'
 	import manageSharing from '../sharing/userTeam'
@@ -100,6 +115,7 @@
 		},
 		components: {
 			manageSharing,
+			verte,
 		},
 		beforeMount() {
 			// Check if the user is already logged in, if so, redirect him to the homepage
diff --git a/src/models/list.js b/src/models/list.js
index 86e941369..bfabe2205 100644
--- a/src/models/list.js
+++ b/src/models/list.js
@@ -6,7 +6,11 @@ export default class ListModel extends AbstractModel {
 	
 	constructor(data) {
 		super(data)
-		
+
+		if (this.hex_color !== '' && this.hex_color.substring(0, 1) !== '#') {
+			this.hex_color = '#' + this.hex_color
+		}
+
 		// Make all tasks to task models
 		this.tasks = this.tasks.map(t => {
 			return new TaskModel(t)
@@ -28,6 +32,7 @@ export default class ListModel extends AbstractModel {
 			tasks: [],
 			namespaceID: 0,
 			is_archived: false,
+			hex_color: '',
 
 			created: null,
 			updated: null,
diff --git a/src/models/namespace.js b/src/models/namespace.js
index eb5d4e4d7..7a4449f1b 100644
--- a/src/models/namespace.js
+++ b/src/models/namespace.js
@@ -6,6 +6,10 @@ export default class NamespaceModel extends AbstractModel {
 	constructor(data) {
 		super(data)
 
+		if (this.hex_color !== '' && this.hex_color.substring(0, 1) !== '#') {
+			this.hex_color = '#' + this.hex_color
+		}
+
 		this.lists = this.lists.map(l => {
 			return new ListModel(l)
 		})
@@ -24,6 +28,7 @@ export default class NamespaceModel extends AbstractModel {
 			owner: UserModel,
 			lists: [],
 			is_archived: false,
+			hex_color: '',
 
 			created: null,
 			updated: null,
diff --git a/src/services/list.js b/src/services/list.js
index dff27c2a5..41773c441 100644
--- a/src/services/list.js
+++ b/src/services/list.js
@@ -28,6 +28,12 @@ export default class ListService extends AbstractService {
 		model.tasks = model.tasks.map(task => {
 			return taskService.beforeUpdate(task)
 		})
+		model.hex_color = model.hex_color.substring(1, 7)
 		return model
 	}
+
+	beforeCreate(list) {
+		list.hex_color = list.hex_color.substring(1, 7)
+		return list
+	}
 }
\ No newline at end of file
diff --git a/src/services/namespace.js b/src/services/namespace.js
index 36d1f1ab8..546c98b61 100644
--- a/src/services/namespace.js
+++ b/src/services/namespace.js
@@ -22,4 +22,14 @@ export default class NamespaceService extends AbstractService {
 	modelFactory(data) {
 		return new NamespaceModel(data)
 	}
+
+	beforeUpdate(namespace) {
+		namespace.hex_color = namespace.hex_color.substring(1, 7)
+		return namespace
+	}
+
+	beforeCreate(namespace) {
+		namespace.hex_color = namespace.hex_color.substring(1, 7)
+		return namespace
+	}
 }
\ No newline at end of file
diff --git a/src/styles/theme/navigation.scss b/src/styles/theme/navigation.scss
index 4f720cb93..ee5aa7ae2 100644
--- a/src/styles/theme/navigation.scss
+++ b/src/styles/theme/navigation.scss
@@ -130,9 +130,18 @@
         align-items: center;
         justify-content: space-between;
 
-        span:not(.icon) {
+        span.name:not(.icon) {
           overflow: hidden;
           text-overflow: ellipsis;
+
+          .color-bubble {
+            display: inline-block;
+            vertical-align: initial;
+            width: 12px;
+            height: 12px;
+            border-radius: 100%;
+            margin-right: 2px;
+          }
         }
 
         .is-archived {
@@ -149,8 +158,15 @@
         }
       }
 
-      .menu-label .is-archived {
-        min-width: 85px;
+      .menu-label {
+        .color-bubble {
+          width: 14px !important;
+          height: 14px !important;
+        }
+
+        .is-archived {
+          min-width: 85px;
+        }
       }
 
       .nsettings{