From b91a2f7a827200e2796d186e538b3ecce6e1b432 Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Wed, 20 Mar 2024 16:26:59 +0100
Subject: [PATCH 1/3] add Team button that redirects to contacts app

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 src/components/Icon/TeamsIcon.vue             |  2 +-
 src/components/Page/LandingPageWidgets.vue    | 27 ++++++++++++++++++-
 .../Page/LandingPageWidgets/MembersWidget.vue |  9 ++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/components/Icon/TeamsIcon.vue b/src/components/Icon/TeamsIcon.vue
index ee9737f4d..c2366d185 100644
--- a/src/components/Icon/TeamsIcon.vue
+++ b/src/components/Icon/TeamsIcon.vue
@@ -9,7 +9,7 @@
 			class="material-design-icon__svg"
 			:width="size"
 			:height="size"
-			viewBox="0 0 21.33 21.33">
+			viewBox="0 0 24 24">
 			<path d="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
 		</svg>
 	</span>
diff --git a/src/components/Page/LandingPageWidgets.vue b/src/components/Page/LandingPageWidgets.vue
index 963ee0566..d28b83129 100644
--- a/src/components/Page/LandingPageWidgets.vue
+++ b/src/components/Page/LandingPageWidgets.vue
@@ -1,6 +1,16 @@
 <template>
 	<div class="landing-page-widgets">
-		<MembersWidget v-if="!isPublic" />
+		<div class="first-row-widgets">
+			<MembersWidget v-if="!isPublic" :current-collective="currentCollective" />
+			<NcButton v-if="'contacts' in OC.appswebroots" :href="teamUrl">
+				<template #icon>
+					<TeamsIcon :size="20" />
+				</template>
+				<template #default>
+					{{ t('collectives','Team') }}
+				</template>
+			</NcButton>
+		</div>
 		<RecentPagesWidget />
 	</div>
 </template>
@@ -9,6 +19,9 @@
 import { mapGetters } from 'vuex'
 import MembersWidget from './LandingPageWidgets/MembersWidget.vue'
 import RecentPagesWidget from './LandingPageWidgets/RecentPagesWidget.vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import TeamsIcon from '../Icon/TeamsIcon.vue'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'LandingPageWidgets',
@@ -16,12 +29,18 @@ export default {
 	components: {
 		MembersWidget,
 		RecentPagesWidget,
+		NcButton,
+		TeamsIcon,
 	},
 
 	computed: {
 		...mapGetters([
 			'isPublic',
+			'currentCollective',
 		]),
+		teamUrl() {
+			return generateUrl('/apps/contacts/circle/{teamId}', { teamId: this.currentCollective.circleId })
+		},
 	},
 }
 </script>
@@ -30,6 +49,12 @@ export default {
 .landing-page-widgets {
 	padding-left: 12px;
 }
+.first-row-widgets{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 12px;
+}
 
 @media print {
 	/* Don't print unwanted elements */
diff --git a/src/components/Page/LandingPageWidgets/MembersWidget.vue b/src/components/Page/LandingPageWidgets/MembersWidget.vue
index 4f6154e1b..f37b4c76c 100644
--- a/src/components/Page/LandingPageWidgets/MembersWidget.vue
+++ b/src/components/Page/LandingPageWidgets/MembersWidget.vue
@@ -44,6 +44,12 @@ export default {
 		NcButton,
 		SkeletonLoading,
 	},
+	props: {
+		currentCollective: {
+			type: Object,
+			required: true,
+		},
+	},
 
 	data() {
 		return {
@@ -55,7 +61,6 @@ export default {
 		...mapGetters([
 			'circleMembersSorted',
 			'circleMemberType',
-			'currentCollective',
 			'recentPagesUserIds',
 		]),
 
@@ -151,13 +156,11 @@ export default {
 <style lang="scss" scoped>
 .members-widget-skeleton {
 	height: 44px;
-	margin-top: 12px;
 }
 
 .members-widget-members {
 	display: flex;
 	flex-direction: row;
 	gap: 12px;
-	margin-top: 12px;
 }
 </style>

From 9a747fd22b66157a154aedb29826a676c81fb505 Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Thu, 21 Mar 2024 13:42:51 +0100
Subject: [PATCH 2/3] change team text to Team Overview

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 src/components/Page/LandingPageWidgets.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Page/LandingPageWidgets.vue b/src/components/Page/LandingPageWidgets.vue
index d28b83129..57504b361 100644
--- a/src/components/Page/LandingPageWidgets.vue
+++ b/src/components/Page/LandingPageWidgets.vue
@@ -7,7 +7,7 @@
 					<TeamsIcon :size="20" />
 				</template>
 				<template #default>
-					{{ t('collectives','Team') }}
+					{{ t('collectives','Team Overview') }}
 				</template>
 			</NcButton>
 		</div>

From d17a27e67bcbeec83448962ff155d0b28d9bde42 Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Mon, 25 Mar 2024 19:25:26 +0100
Subject: [PATCH 3/3] improve team Overview button on mobile

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 src/components/Page/LandingPageWidgets.vue       | 16 ++++++++++++----
 .../Page/LandingPageWidgets/MembersWidget.vue    |  7 +------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/Page/LandingPageWidgets.vue b/src/components/Page/LandingPageWidgets.vue
index 57504b361..08b86d082 100644
--- a/src/components/Page/LandingPageWidgets.vue
+++ b/src/components/Page/LandingPageWidgets.vue
@@ -1,12 +1,12 @@
 <template>
 	<div class="landing-page-widgets">
 		<div class="first-row-widgets">
-			<MembersWidget v-if="!isPublic" :current-collective="currentCollective" />
-			<NcButton v-if="'contacts' in OC.appswebroots" :href="teamUrl">
+			<MembersWidget v-if="!isPublic" />
+			<NcButton v-if="hasContactsApp" :href="teamUrl">
 				<template #icon>
 					<TeamsIcon :size="20" />
 				</template>
-				<template #default>
+				<template v-if="!isMobile" #default>
 					{{ t('collectives','Team Overview') }}
 				</template>
 			</NcButton>
@@ -22,6 +22,7 @@ import RecentPagesWidget from './LandingPageWidgets/RecentPagesWidget.vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import TeamsIcon from '../Icon/TeamsIcon.vue'
 import { generateUrl } from '@nextcloud/router'
+import isMobile from '@nextcloud/vue/dist/Mixins/isMobile.js'
 
 export default {
 	name: 'LandingPageWidgets',
@@ -33,6 +34,10 @@ export default {
 		TeamsIcon,
 	},
 
+	mixins: [
+		isMobile,
+	],
+
 	computed: {
 		...mapGetters([
 			'isPublic',
@@ -41,13 +46,16 @@ export default {
 		teamUrl() {
 			return generateUrl('/apps/contacts/circle/{teamId}', { teamId: this.currentCollective.circleId })
 		},
+		hasContactsApp() {
+			return 'contacts' in this.OC.appswebroots
+		},
 	},
 }
 </script>
 
 <style scoped>
 .landing-page-widgets {
-	padding-left: 12px;
+	padding-inline: 12px;
 }
 .first-row-widgets{
 	display: flex;
diff --git a/src/components/Page/LandingPageWidgets/MembersWidget.vue b/src/components/Page/LandingPageWidgets/MembersWidget.vue
index f37b4c76c..cc4d7b8a9 100644
--- a/src/components/Page/LandingPageWidgets/MembersWidget.vue
+++ b/src/components/Page/LandingPageWidgets/MembersWidget.vue
@@ -44,12 +44,6 @@ export default {
 		NcButton,
 		SkeletonLoading,
 	},
-	props: {
-		currentCollective: {
-			type: Object,
-			required: true,
-		},
-	},
 
 	data() {
 		return {
@@ -61,6 +55,7 @@ export default {
 		...mapGetters([
 			'circleMembersSorted',
 			'circleMemberType',
+			'currentCollective',
 			'recentPagesUserIds',
 		]),