From 756b4ddcc227d087f4fff266b2ba629f6df56bf7 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Sat, 22 Dec 2018 11:39:39 +0100
Subject: [PATCH] Use app nav children for categories

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 src/components/DeckAppNav.vue | 110 ++++++++++++++++++++++++----------
 src/main.js                   |   1 +
 src/store/main.js             |  10 ++++
 3 files changed, 91 insertions(+), 30 deletions(-)

diff --git a/src/components/DeckAppNav.vue b/src/components/DeckAppNav.vue
index 7bd82ca3e..36d55d1fb 100644
--- a/src/components/DeckAppNav.vue
+++ b/src/components/DeckAppNav.vue
@@ -26,40 +26,47 @@
 
 <script>
 
-import { AppNavigation } from 'nextcloud-vue'
+import AppNavigation from 'nextcloud-vue/src/components/AppNavigation/AppNavigation'
 import { translate as t } from 'nextcloud-server/dist/l10n'
 import { boardToMenuItem } from './../helpers/boardToMenuItem'
+import { mapGetters } from 'vuex'
 import store from './../store/main'
 
-const defaultCategories = [
-	{
-		id: 'deck-boards',
-		classes: [],
-		icon: 'icon-deck',
-		text: t('deck', 'All boards'),
-		router: {
-			name: 'boards'
-		}
+const categoryAll = {
+	id: 'deck-boards',
+	classes: [],
+	icon: 'icon-deck',
+	text: t('deck', 'All boards'),
+	router: {
+		name: 'boards'
 	},
-	{
-		id: 'deck-boards-archived',
-		classes: [],
-		icon: 'icon-archive',
-		text: t('deck', 'Archived boards'),
-		router: {
-			name: 'boards.archived'
-		}
+	collapsible: false,
+	children: []
+}
+
+const categoryArchived = {
+	id: 'deck-boards-archived',
+	classes: [],
+	icon: 'icon-archive',
+	text: t('deck', 'Archived boards'),
+	router: {
+		name: 'boards.archived'
 	},
-	{
-		id: 'deck-boards-shared',
-		classes: [],
-		icon: 'icon-shared',
-		text: t('deck', 'Shared boards'),
-		router: {
-			name: 'boards.shared'
-		}
-	}
-]
+	collapsible: false,
+	children: []
+}
+
+const categoryShared = 	{
+	id: 'deck-boards-shared',
+	classes: [],
+	icon: 'icon-shared',
+	text: t('deck', 'Shared boards'),
+	router: {
+		name: 'boards.shared'
+	},
+	collapsible: false,
+	children: []
+}
 
 const addButton = {
 	icon: 'icon-add',
@@ -96,11 +103,54 @@ export default {
 		}
 	},
 	computed: {
+		...mapGetters([
+			'noneArchivedBoards',
+			'archivedBoards',
+			'sharedBoards'
+		]),
+		allBoardsNavItem: function() {
+			return {
+				id: 'deck-boards',
+				classes: [],
+				icon: 'icon-deck',
+				text: t('deck', 'All boards'),
+				router: {
+					name: 'boards'
+				},
+				collapsible: true,
+				children: this.noneArchivedBoards.map(boardToMenuItem)
+			}
+		},
+		archivedBoardsNavItem: function() {
+			return {
+				id: 'deck-boards-archived',
+				classes: [],
+				icon: 'icon-archive',
+				text: t('deck', 'Archived boards'),
+				router: {
+					name: 'boards.archived'
+				},
+				collapsible: true,
+				children: this.archivedBoards.map(boardToMenuItem)
+			}
+		},
+		sharedBoardsNavItem: function() {
+			return {
+				id: 'deck-boards-shared',
+				classes: [],
+				icon: 'icon-shared',
+				text: t('deck', 'Shared boards'),
+				router: {
+					name: 'boards.shared'
+				},
+				collapsible: false,
+				children: this.sharedBoards.map(boardToMenuItem)
+			}
+		},
 		menu: function() {
 			return {
 				loading: this.loading,
-				items: defaultCategories
-					.concat(this.$store.getters.noneArchivedBoards.map(boardToMenuItem))
+				items: [this.allBoardsNavItem, this.archivedBoardsNavItem, this.sharedBoardsNavItem]
 					.concat([this.addButton])
 			}
 		}
diff --git a/src/main.js b/src/main.js
index 49e151684..e62734851 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,6 +34,7 @@ import VTooltip from 'v-tooltip'
  * @typedef {Object} Board
  * @property {String} title
  * @property {boolean} archived
+ * @property {number} shared 1 (shared) or 0 (not shared)
  */
 
 // eslint-disable-next-line
diff --git a/src/store/main.js b/src/store/main.js
index 9a4d0483f..26f4af848 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -55,6 +55,16 @@ export default new Vuex.Store({
 				return board.archived === false
 			})
 		},
+		archivedBoards: state => {
+			return state.boards.filter(board => {
+				return board.archived === true
+			})
+		},
+		sharedBoards: state => {
+			return state.boards.filter(board => {
+				return board.shared
+			})
+		},
 		filteredBoards: state => {
 			// filters the boards depending on the active filter
 			const boards = state.boards.filter(board => {