fixup! Redesign calendar sharing

nextcloud · Sep 20, 2022 · 43a1720 · 43a1720
1 parent 1c28f5a
commit 43a1720
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/...components/Calendar/EditCalendarModal.vue → ...nents/AppNavigation/EditCalendarModal.vue b/...components/Calendar/EditCalendarModal.vue → ...nents/AppNavigation/EditCalendarModal.vue
@@ -46,9 +46,9 @@
 			</h2>
 
 			<div class="edit-calendar-modal__sharing">
-				<CalendarListItemSharingPublishItem :calendar="calendar" />
-				<CalendarListItemSharingSearch :calendar="calendar" />
-				<CalendarListItemSharingShareItem v-for="sharee in calendar.shares"
+				<PublishCalendar :calendar="calendar" />
+				<SharingSearch :calendar="calendar" />
+				<ShareItem v-for="sharee in calendar.shares"
 					:key="sharee.uri"
 					:sharee="sharee"
 					:calendar="calendar" />
@@ -67,12 +67,9 @@
 import NcModal from '@nextcloud/vue/dist/Components/NcModal'
 import NcColorPicker from '@nextcloud/vue/dist/Components/NcColorPicker'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton'
-import CalendarListItemSharingPublishItem
-	from '../AppNavigation/CalendarList/CalendarListItemSharingPublishItem'
-import CalendarListItemSharingSearch
-	from '../AppNavigation/CalendarList/CalendarListItemSharingSearch'
-import CalendarListItemSharingShareItem
-	from '../AppNavigation/CalendarList/CalendarListItemSharingShareItem'
+import PublishCalendar from './EditCalendarModal/PublishCalendar'
+import SharingSearch from './EditCalendarModal/SharingSearch'
+import ShareItem from './EditCalendarModal/ShareItem'
 import { mapGetters } from 'vuex'
 import { randomId } from '../../utils/randomId'
 
@@ -82,9 +79,9 @@ export default {
 		NcModal,
 		NcColorPicker,
 		NcButton,
-		CalendarListItemSharingSearch,
-		CalendarListItemSharingPublishItem,
-		CalendarListItemSharingShareItem,
+		PublishCalendar,
+		SharingSearch,
+		ShareItem,
 	},
 	props: {
 	},

diff --git a/...st/CalendarListItemSharingPublishItem.vue → ...ion/EditCalendarModal/PublishCalendar.vue b/...st/CalendarListItemSharingPublishItem.vue → ...ion/EditCalendarModal/PublishCalendar.vue
@@ -162,7 +162,7 @@ import Email from 'vue-material-design-icons/Email.vue'
 import LinkVariant from 'vue-material-design-icons/LinkVariant.vue'
 
 export default {
-	name: 'CalendarListItemSharingPublishItem',
+	name: 'PublishCalendar',
 	components: {
 		NcActions,
 		NcActionButton,

diff --git a/...List/CalendarListItemSharingShareItem.vue → ...avigation/EditCalendarModal/ShareItem.vue b/...List/CalendarListItemSharingShareItem.vue → ...avigation/EditCalendarModal/ShareItem.vue
@@ -64,7 +64,7 @@ import {
 import { randomId } from '../../../utils/randomId'
 
 export default {
-	name: 'CalendarListItemSharingShareItem',
+	name: 'ShareItem',
 	components: {
 		NcActions,
 		NcActionButton,

diff --git a/...darList/CalendarListItemSharingSearch.vue → ...ation/EditCalendarModal/SharingSearch.vue b/...darList/CalendarListItemSharingSearch.vue → ...ation/EditCalendarModal/SharingSearch.vue
@@ -53,7 +53,7 @@ import { generateOcsUrl } from '@nextcloud/router'
 import { urldecode } from '../../../utils/url.js'
 
 export default {
-	name: 'CalendarListItemSharingSearch',
+	name: 'SharingSearch',
 	components: {
 		Multiselect,
 	},

diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
@@ -73,7 +73,7 @@ import CalendarListNew from '../components/AppNavigation/CalendarList/CalendarLi
 import EmbedTopNavigation from '../components/AppNavigation/EmbedTopNavigation.vue'
 import EmptyCalendar from '../components/EmptyCalendar.vue'
 import CalendarGrid from '../components/CalendarGrid.vue'
-import EditCalendarModal from '../components/Calendar/EditCalendarModal.vue'
+import EditCalendarModal from '../components/AppNavigation/EditCalendarModal.vue'
 
 // Import CalDAV related methods
 import {