From 9b8282e2e0116f02168d455770a25e91e09e552b Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 8 Sep 2022 13:15:08 +0530
Subject: [PATCH 1/6] remove appointment

---
 .../AppNavigation/AppointmentConfigList.vue           | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/components/AppNavigation/AppointmentConfigList.vue b/src/components/AppNavigation/AppointmentConfigList.vue
index 0f62b816b..d1a94bf8a 100644
--- a/src/components/AppNavigation/AppointmentConfigList.vue
+++ b/src/components/AppNavigation/AppointmentConfigList.vue
@@ -27,17 +27,6 @@
 	-->
 	<div v-if="hasAtLeastOneCalendar"
 		class="appointment-config-list">
-		<AppNavigationCaption class="appointment-config-list__caption"
-			:title="t('calendar', 'Appointments')">
-			<template v-if="hasUserEmailAddress"
-				#actions>
-				<ActionButton :close-after-click="true"
-					@click="showModalForNewConfig = true">
-					<PlusIcon slot="icon" :size="20" decorative />
-					{{ t('calendar', 'Add new') }}
-				</ActionButton>
-			</template>
-		</AppNavigationCaption>
 
 		<template v-if="hasUserEmailAddress">
 			<template v-if="sortedConfigs.length > 0">
-- 
GitLab


From 157d81593542aaf2345deaf46d4fa16fbd442e4a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 8 Sep 2022 13:21:04 +0530
Subject: [PATCH 2/6] remove appointment

---
 src/components/AppNavigation/AppointmentConfigList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/AppointmentConfigList.vue b/src/components/AppNavigation/AppointmentConfigList.vue
index d1a94bf8a..b0b2b2a5e 100644
--- a/src/components/AppNavigation/AppointmentConfigList.vue
+++ b/src/components/AppNavigation/AppointmentConfigList.vue
@@ -27,7 +27,6 @@
 	-->
 	<div v-if="hasAtLeastOneCalendar"
 		class="appointment-config-list">
-
 		<template v-if="hasUserEmailAddress">
 			<template v-if="sortedConfigs.length > 0">
 				<AppointmentConfigListItem v-for="config in sortedConfigs"
-- 
GitLab


From 8fe1a7eb6f1c826aa2951b2420dd6c26dcd0cc4d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 8 Sep 2022 13:31:57 +0530
Subject: [PATCH 3/6] remove appointment

---
 .../AppNavigation/AppointmentConfigList.vue       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/components/AppNavigation/AppointmentConfigList.vue b/src/components/AppNavigation/AppointmentConfigList.vue
index b0b2b2a5e..715af6055 100644
--- a/src/components/AppNavigation/AppointmentConfigList.vue
+++ b/src/components/AppNavigation/AppointmentConfigList.vue
@@ -28,13 +28,6 @@
 	<div v-if="hasAtLeastOneCalendar"
 		class="appointment-config-list">
 		<template v-if="hasUserEmailAddress">
-			<template v-if="sortedConfigs.length > 0">
-				<AppointmentConfigListItem v-for="config in sortedConfigs"
-					:key="config.id"
-					:config="config"
-					@delete="deleteConfig(config)" />
-			</template>
-
 			<AppointmentConfigModal v-if="showModalForNewConfig"
 				:is-new="true"
 				:config="defaultConfig"
@@ -45,10 +38,6 @@
 </template>
 
 <script>
-import AppointmentConfigListItem from './AppointmentConfigList/AppointmentConfigListItem'
-import AppNavigationCaption from '@nextcloud/vue/dist/Components/AppNavigationCaption'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import PlusIcon from 'vue-material-design-icons/Plus'
 import AppointmentConfigModal from '../AppointmentConfigModal'
 import AppointmentConfig from '../../models/appointmentConfig'
 import logger from '../../utils/logger'
@@ -58,10 +47,6 @@ import NoEmailAddressWarning from '../AppointmentConfigModal/NoEmailAddressWarni
 export default {
 	name: 'AppointmentConfigList',
 	components: {
-		AppointmentConfigListItem,
-		AppNavigationCaption,
-		ActionButton,
-		PlusIcon,
 		AppointmentConfigModal,
 		NoEmailAddressWarning,
 	},
-- 
GitLab


From bdac3d5bff165c3a9b7045a1d06324dc0e1db050 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 14 Sep 2022 16:41:24 +0530
Subject: [PATCH 4/6] appointment feature remove completely

---
 .../AppNavigation/AppointmentConfigList.vue   | 29 ++++++++++++++++++-
 src/views/Calendar.vue                        |  3 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigation/AppointmentConfigList.vue b/src/components/AppNavigation/AppointmentConfigList.vue
index 715af6055..5b6ab48a4 100644
--- a/src/components/AppNavigation/AppointmentConfigList.vue
+++ b/src/components/AppNavigation/AppointmentConfigList.vue
@@ -27,7 +27,26 @@
 	-->
 	<div v-if="hasAtLeastOneCalendar"
 		class="appointment-config-list">
+		<AppNavigationCaption class="appointment-config-list__caption"
+			:title="t('calendar', 'Appointments')">
+			<template v-if="hasUserEmailAddress"
+				#actions>
+				<ActionButton :close-after-click="true"
+					@click="showModalForNewConfig = true">
+					<PlusIcon slot="icon" :size="20" decorative />
+					{{ t('calendar', 'Add new') }}
+				</ActionButton>
+			</template>
+		</AppNavigationCaption>
+
 		<template v-if="hasUserEmailAddress">
+			<template v-if="sortedConfigs.length > 0">
+				<AppointmentConfigListItem v-for="config in sortedConfigs"
+					:key="config.id"
+					:config="config"
+					@delete="deleteConfig(config)" />
+			</template>
+
 			<AppointmentConfigModal v-if="showModalForNewConfig"
 				:is-new="true"
 				:config="defaultConfig"
@@ -38,6 +57,10 @@
 </template>
 
 <script>
+import AppointmentConfigListItem from './AppointmentConfigList/AppointmentConfigListItem'
+import AppNavigationCaption from '@nextcloud/vue/dist/Components/AppNavigationCaption'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import PlusIcon from 'vue-material-design-icons/Plus'
 import AppointmentConfigModal from '../AppointmentConfigModal'
 import AppointmentConfig from '../../models/appointmentConfig'
 import logger from '../../utils/logger'
@@ -47,6 +70,10 @@ import NoEmailAddressWarning from '../AppointmentConfigModal/NoEmailAddressWarni
 export default {
 	name: 'AppointmentConfigList',
 	components: {
+		AppointmentConfigListItem,
+		AppNavigationCaption,
+		ActionButton,
+		PlusIcon,
 		AppointmentConfigModal,
 		NoEmailAddressWarning,
 	},
@@ -104,4 +131,4 @@ export default {
 		},
 	},
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
index 76d0e2cce..830e3b349 100644
--- a/src/views/Calendar.vue
+++ b/src/views/Calendar.vue
@@ -178,8 +178,7 @@ export default {
 			return null
 		},
 		hasAppointmentsFeature() {
-			// TODO: Remove me when Calendar doesn't support server < 23
-			return parseInt(OC.config.version.split('.')[0]) >= 23
+			return false
 		},
 	},
 	created() {
-- 
GitLab


From dd023466804a37ffcbd5fb96c8275518cad157e3 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 14 Sep 2022 16:46:33 +0530
Subject: [PATCH 5/6] appointment feature remove completely

---
 src/views/Calendar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
index 830e3b349..0da5ec1dc 100644
--- a/src/views/Calendar.vue
+++ b/src/views/Calendar.vue
@@ -178,6 +178,7 @@ export default {
 			return null
 		},
 		hasAppointmentsFeature() {
+			// TODO: Remove me when Calendar doesn't support server < 23
 			return false
 		},
 	},
-- 
GitLab


From 33a254fb606dfce18f25165ccda793b11c1b1a53 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 14 Sep 2022 16:53:37 +0530
Subject: [PATCH 6/6] appointment feature remove completely

---
 src/components/AppNavigation/AppointmentConfigList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/AppointmentConfigList.vue b/src/components/AppNavigation/AppointmentConfigList.vue
index 5b6ab48a4..0f62b816b 100644
--- a/src/components/AppNavigation/AppointmentConfigList.vue
+++ b/src/components/AppNavigation/AppointmentConfigList.vue
@@ -131,4 +131,4 @@ export default {
 		},
 	},
 }
-</script>
\ No newline at end of file
+</script>
-- 
GitLab