From 64e3cae594f4bb1e50601141a06a16908f722239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 2 Jun 2021 10:03:58 +0200
Subject: [PATCH] Comply to new resizeable list feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 .eslintrc.js                                  |   1 +
 css/contacts.scss                             |   7 +-
 .../AppContent/AppDetailsToggle.vue           |  70 ------------
 src/components/AppContent/CircleContent.vue   | 101 +++++++++---------
 src/components/AppContent/ContactsContent.vue |  96 ++++++++++-------
 src/components/ContactDetails.vue             |   6 --
 src/views/Contacts.vue                        |  25 +----
 7 files changed, 120 insertions(+), 186 deletions(-)
 delete mode 100644 src/components/AppContent/AppDetailsToggle.vue

diff --git a/.eslintrc.js b/.eslintrc.js
index a532df9ed..29134f1da 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,6 @@
 module.exports = {
 	globals: {
+		appName: true,
 		appVersion: true,
 	},
 
diff --git a/css/contacts.scss b/css/contacts.scss
index 6d411addb..bf188f0b3 100644
--- a/css/contacts.scss
+++ b/css/contacts.scss
@@ -42,8 +42,13 @@ $list-width: 300px;
 
 
 // global design overrides
-#app-content-wrapper {
+.app-content-wrapper {
 	display: flex;
+
+	// center error messages
+	.empty-content {
+		margin: auto
+	}
 }
 
 .app-content-details {
diff --git a/src/components/AppContent/AppDetailsToggle.vue b/src/components/AppContent/AppDetailsToggle.vue
deleted file mode 100644
index f9c86b60d..000000000
--- a/src/components/AppContent/AppDetailsToggle.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-  - @copyright Copyright (c) 2021 John Molakvoæ <skjnldsv@protonmail.com>
-  -
-  - @author John Molakvoæ <skjnldsv@protonmail.com>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -
-  -->
-
-<template>
-	<a v-tooltip="t('contacts', 'Go back to the list')" class="app-details-toggle icon-confirm" href="#" />
-</template>
-
-<script>
-export default {
-	name: 'AppDetailsToggle',
-
-	beforeMount() {
-		this.toggleAppNavigationButton(true)
-	},
-
-	beforeDestroy() {
-		this.toggleAppNavigationButton(false)
-	},
-
-	methods: {
-		toggleAppNavigationButton(hide = true) {
-			const appNavigationToggle = document.querySelector('.app-navigation .app-navigation-toggle')
-			if (appNavigationToggle) {
-				appNavigationToggle.style.display = hide ? 'none' : null
-			}
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.app-details-toggle {
-	position: absolute;
-	width: 44px;
-	height: 44px;
-	padding: 14px;
-	cursor: pointer;
-	opacity: .6;
-	font-size: 16px;
-	line-height: 17px;
-	transform: rotate(180deg);
-	background-color: var(--color-main-background);
-	z-index: 2000;
-
-	&:active,
-	&:hover,
-	&:focus {
-		opacity: 1;
-	}
-}
-</style>
diff --git a/src/components/AppContent/CircleContent.vue b/src/components/AppContent/CircleContent.vue
index d5e22f15c..00f203fff 100644
--- a/src/components/AppContent/CircleContent.vue
+++ b/src/components/AppContent/CircleContent.vue
@@ -21,55 +21,56 @@
   -->
 
 <template>
-	<AppContent>
-		<div v-if="!circle">
-			<EmptyContent icon="icon-circles">
-				{{ t('contacts', 'Please select a circle') }}
-			</EmptyContent>
-		</div>
-
-		<div v-else-if="loading">
-			<EmptyContent icon="icon-loading">
-				{{ t('contacts', 'Loading circle …') }}
-			</EmptyContent>
-		</div>
-
-		<div v-else id="app-content-wrapper">
-			<AppDetailsToggle v-if="isMobile && showDetails" @click.native.stop.prevent="hideDetails" />
-
-			<!-- member list -->
-			<MemberList :list="members" :loading="loadingList" :show-details.sync="showDetails" />
-
-			<!-- main contacts details -->
-			<CircleDetails :circle="circle">
-				<!-- not a member -->
-				<template v-if="!circle.isMember">
-					<!-- Join request in progress -->
-					<EmptyContent v-if="loadingJoin" icon="icon-loading">
-						{{ t('contacts', 'Joining circle') }}
-					</EmptyContent>
-
-					<!-- Pending request validation -->
-					<EmptyContent v-else-if="circle.isPendingJoin" icon="icon-loading">
-						{{ t('contacts', 'Your request to join this circle is pending approval') }}
-					</EmptyContent>
-
-					<EmptyContent v-else icon="icon-circles">
-						{{ t('contacts', 'You are not a member of {circle}', { circle: circle.displayName}) }}
-
-						<!-- Only show the join button if the circle is accepting requests -->
-						<template v-if="circle.canJoin" #desc>
-							<button :disabled="loadingJoin" class="primary" @click="requestJoin">
-								<Login slot="icon"
-									:size="16"
-									decorative />
-								{{ t('contacts', 'Request to join') }}
-							</button>
-						</template>
-					</EmptyContent>
-				</template>
-			</CircleDetails>
-		</div>
+	<AppContent v-if="!circle">
+		<EmptyContent icon="icon-circles">
+			{{ t('contacts', 'Please select a circle') }}
+		</EmptyContent>
+	</AppContent>
+
+	<AppContent v-else-if="loading">
+		<EmptyContent icon="icon-loading">
+			{{ t('contacts', 'Loading circle …') }}
+		</EmptyContent>
+	</AppContent>
+
+	<AppContent v-else :show-details.sync="showDetails">
+		<!-- member list -->
+		<template #list>
+			<MemberList
+				:list="members"
+				:loading="loadingList"
+				:show-details.sync="showDetails" />
+		</template>
+
+		<!-- main contacts details -->
+		<CircleDetails :circle="circle">
+			<!-- not a member -->
+			<template v-if="!circle.isMember">
+				<!-- Join request in progress -->
+				<EmptyContent v-if="loadingJoin" icon="icon-loading">
+					{{ t('contacts', 'Joining circle') }}
+				</EmptyContent>
+
+				<!-- Pending request validation -->
+				<EmptyContent v-else-if="circle.isPendingJoin" icon="icon-loading">
+					{{ t('contacts', 'Your request to join this circle is pending approval') }}
+				</EmptyContent>
+
+				<EmptyContent v-else icon="icon-circles">
+					{{ t('contacts', 'You are not a member of {circle}', { circle: circle.displayName}) }}
+
+					<!-- Only show the join button if the circle is accepting requests -->
+					<template v-if="circle.canJoin" #desc>
+						<button :disabled="loadingJoin" class="primary" @click="requestJoin">
+							<Login slot="icon"
+								:size="16"
+								decorative />
+							{{ t('contacts', 'Request to join') }}
+						</button>
+					</template>
+				</EmptyContent>
+			</template>
+		</CircleDetails>
 	</AppContent>
 </template>
 <script>
@@ -79,7 +80,6 @@ import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
 
 import Login from 'vue-material-design-icons/Login'
 
-import AppDetailsToggle from '../AppContent/AppDetailsToggle'
 import CircleDetails from '../CircleDetails'
 import MemberList from '../MemberList'
 import RouterMixin from '../../mixins/RouterMixin'
@@ -91,7 +91,6 @@ export default {
 
 	components: {
 		AppContent,
-		AppDetailsToggle,
 		CircleDetails,
 		EmptyContent,
 		Login,
diff --git a/src/components/AppContent/ContactsContent.vue b/src/components/AppContent/ContactsContent.vue
index 779f84cf1..45368a319 100644
--- a/src/components/AppContent/ContactsContent.vue
+++ b/src/components/AppContent/ContactsContent.vue
@@ -21,48 +21,48 @@
   -->
 
 <template>
-	<AppContent>
-		<div v-if="loading">
-			<EmptyContent icon="icon-loading">
-				{{ t('contacts', 'Loading contacts …') }}
-			</EmptyContent>
-		</div>
-
-		<div v-else-if="isEmptyGroup && !isRealGroup">
-			<EmptyContent icon="icon-contacts-dark">
-				{{ t('contacts', 'There are no contacts yet') }}
-				<template #desc>
-					<button class="primary" @click="newContact">
-						{{ t('contacts', 'Create contact') }}
-					</button>
-				</template>
-			</EmptyContent>
-		</div>
-
-		<div v-else-if="isEmptyGroup && isRealGroup">
-			<EmptyContent icon="icon-contacts-dark">
-				{{ t('contacts', 'There are no contacts in this group') }}
-				<template #desc>
-					<button v-if="contacts.length === 0" class="primary" @click="addContactsToGroup(selectedGroup)">
-						{{ t('contacts', 'Create contacts') }}
-					</button>
-					<button v-else class="primary" @click="addContactsToGroup(selectedGroup)">
-						{{ t('contacts', 'Add contacts') }}
-					</button>
-				</template>
-			</EmptyContent>
-		</div>
-
-		<div v-else id="app-content-wrapper">
-			<!-- contacts list -->
+	<AppContent v-if="loading">
+		<EmptyContent icon="icon-loading">
+			{{ t('contacts', 'Loading contacts …') }}
+		</EmptyContent>
+	</AppContent>
+
+	<AppContent v-else-if="isEmptyGroup && !isRealGroup">
+		<EmptyContent icon="icon-contacts-dark">
+			{{ t('contacts', 'There are no contacts yet') }}
+			<template #desc>
+				<button class="primary" @click="newContact">
+					{{ t('contacts', 'Create contact') }}
+				</button>
+			</template>
+		</EmptyContent>
+	</AppContent>
+
+	<AppContent v-else-if="isEmptyGroup && isRealGroup">
+		<EmptyContent icon="icon-contacts-dark">
+			{{ t('contacts', 'There are no contacts in this group') }}
+			<template #desc>
+				<button v-if="contacts.length === 0" class="primary" @click="addContactsToGroup(selectedGroup)">
+					{{ t('contacts', 'Create contacts') }}
+				</button>
+				<button v-else class="primary" @click="addContactsToGroup(selectedGroup)">
+					{{ t('contacts', 'Add contacts') }}
+				</button>
+			</template>
+		</EmptyContent>
+	</AppContent>
+
+	<AppContent v-else :show-details="showDetails" @update:showDetails="hideDetails">
+		<!-- contacts list -->
+		<template #list>
 			<ContactsList
 				:list="contactsList"
 				:contacts="contacts"
 				:search-query="searchQuery" />
+		</template>
 
-			<!-- main contacts details -->
-			<ContactDetails :contact-key="selectedContact" />
-		</div>
+		<!-- main contacts details -->
+		<ContactDetails :contact-key="selectedContact" />
 	</AppContent>
 </template>
 <script>
@@ -116,6 +116,10 @@ export default {
 			return this.$store.getters.getSortedContacts
 		},
 
+		selectedContact() {
+			return this.$route.params.selectedContact
+		},
+
 		/**
 		 * Is this a real group ?
 		 * Aka not a dynamically generated one like `All contacts`
@@ -131,6 +135,10 @@ export default {
 		isEmptyGroup() {
 			return this.contactsList.length === 0
 		},
+
+		showDetails() {
+			return !!this.selectedContact
+		},
 	},
 
 	methods: {
@@ -148,6 +156,20 @@ export default {
 		newContact() {
 			this.$emit('newContact')
 		},
+
+		/**
+		 * Show the list and deselect contact
+		 */
+		hideDetails() {
+			// Reset the selected contact
+			this.$router.push({
+				name: 'group',
+				params: {
+					selectedGroup: this.selectedGroup,
+					selectedContact: undefined,
+				},
+			})
+		},
 	},
 }
 </script>
diff --git a/src/components/ContactDetails.vue b/src/components/ContactDetails.vue
index 65b8653fa..0d69438dd 100644
--- a/src/components/ContactDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -768,12 +768,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-content-details {
-	flex: 1 1 100%;
-	min-width: 0;
-	padding: 0 80px 80px 80px;
-}
-
 // List of all properties
 section.contact-details {
 	margin: 0 auto;
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index 72f3fd5ee..cff6d15e7 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -22,10 +22,7 @@
   -->
 
 <template>
-	<Content app-name="contacts">
-		<!-- go back to list when in details mode -->
-		<AppDetailsToggle v-if="isMobile && selectedContact" @click.native.stop.prevent="showList" />
-
+	<Content :app-name="appName">
 		<!-- new-contact-button + navigation + settings -->
 		<RootNavigation
 			:contacts-list="contactsList"
@@ -73,7 +70,6 @@ import Modal from '@nextcloud/vue/dist/Components/Modal'
 import { showError } from '@nextcloud/dialogs'
 import { VCardTime } from 'ical.js'
 
-import AppDetailsToggle from '../components/AppContent/AppDetailsToggle'
 import CircleContent from '../components/AppContent/CircleContent'
 import ContactsContent from '../components/AppContent/ContactsContent'
 import ContactsPicker from '../components/EntityPicker/ContactsPicker'
@@ -90,7 +86,6 @@ export default {
 	name: 'Contacts',
 
 	components: {
-		AppDetailsToggle,
 		AppNavigationNew,
 		CircleContent,
 		ContactsContent,
@@ -123,6 +118,8 @@ export default {
 
 	data() {
 		return {
+			appName,
+
 			// Let's but the loading state to true if circles is enabled
 			loadingCircles: isCirclesEnabled,
 			loadingContacts: true,
@@ -369,7 +366,7 @@ export default {
 
 				if (Object.keys(this.contactsList).length) {
 					this.$router.push({
-						name: 'contact',
+						name: 'group',
 						params: {
 							selectedGroup: this.selectedGroup,
 							selectedContact: Object.values(this.contactsList)[0].key,
@@ -379,20 +376,6 @@ export default {
 			}
 		},
 
-		/**
-		 * Show the list and deselect contact
-		 */
-		showList() {
-			// Reset the selected contact
-			this.$router.push({
-				name: 'contact',
-				params: {
-					selectedGroup: this.selectedGroup,
-					selectedContact: undefined,
-				},
-			})
-		},
-
 		/**
 		 * Done importing, the user closed the import status screen
 		 */