From 6919c436f5aeab85bf4e1af53a23121348f17099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Fri, 23 Sep 2022 21:40:17 +0200
Subject: [PATCH] Use global import for nextcloud-vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
---
 src/App.vue                                            |  3 +--
 src/components/AppNavigation/AppNavigationSettings.vue |  2 +-
 src/components/AppNavigation/CalendarShare.vue         |  2 +-
 src/components/AppNavigation/CalendarSharee.vue        |  5 +----
 src/components/AppNavigation/ListItemCalendar.vue      | 10 +---------
 src/components/AppNavigation/Trashbin.vue              |  7 +------
 src/components/AppSidebar/CalendarPickerItem.vue       |  2 +-
 src/components/AppSidebar/CalendarPickerOption.vue     |  3 ++-
 src/components/AppSidebar/DatetimePickerItem.vue       |  2 +-
 src/components/AppSidebar/MultiselectItem.vue          |  2 +-
 src/components/AppSidebar/TagsItem.vue                 |  2 +-
 src/components/DeleteCompletedModal.vue                |  4 +---
 src/components/LoadCompletedButton.vue                 |  2 +-
 src/components/SortorderDropdown.vue                   |  4 +---
 src/components/TaskBody.vue                            |  5 +----
 src/components/TaskCreateDialog.vue                    |  5 +----
 src/components/TaskStatusDisplay.vue                   |  3 +--
 src/mixins/editableItem.js                             |  3 +--
 src/views/AppNavigation.vue                            |  6 +-----
 src/views/AppSidebar.vue                               |  6 +-----
 src/views/Dashboard.vue                                |  5 +----
 21 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 021e837e3..1fe3555d0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -37,8 +37,7 @@ import client from './services/cdav.js'
 
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { translate as t } from '@nextcloud/l10n'
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
-import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
+import { NcAppContent, NcContent } from '@nextcloud/vue'
 
 import { mapGetters } from 'vuex'
 
diff --git a/src/components/AppNavigation/AppNavigationSettings.vue b/src/components/AppNavigation/AppNavigationSettings.vue
index c0a8996e0..51db82ccf 100644
--- a/src/components/AppNavigation/AppNavigationSettings.vue
+++ b/src/components/AppNavigation/AppNavigationSettings.vue
@@ -65,7 +65,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import { translate as t } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings.js'
+import { NcAppNavigationSettings } from '@nextcloud/vue'
 
 import CalendarToday from 'vue-material-design-icons/CalendarToday.vue'
 import CalendarWeek from 'vue-material-design-icons/CalendarWeek.vue'
diff --git a/src/components/AppNavigation/CalendarShare.vue b/src/components/AppNavigation/CalendarShare.vue
index d3229720a..5f32aabd1 100644
--- a/src/components/AppNavigation/CalendarShare.vue
+++ b/src/components/AppNavigation/CalendarShare.vue
@@ -66,7 +66,7 @@ import { urldecode } from '../../utils/url.js'
 import Axios from '@nextcloud/axios'
 import { translate as t } from '@nextcloud/l10n'
 import { generateOcsUrl } from '@nextcloud/router'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import { NcMultiselect } from '@nextcloud/vue'
 
 import debounce from 'debounce'
 
diff --git a/src/components/AppNavigation/CalendarSharee.vue b/src/components/AppNavigation/CalendarSharee.vue
index fa5cc9703..3282fdfc3 100644
--- a/src/components/AppNavigation/CalendarSharee.vue
+++ b/src/components/AppNavigation/CalendarSharee.vue
@@ -60,10 +60,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+import { NcActionButton, NcActionCheckbox, NcAppNavigationItem, NcAvatar } from '@nextcloud/vue'
 
 import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
diff --git a/src/components/AppNavigation/ListItemCalendar.vue b/src/components/AppNavigation/ListItemCalendar.vue
index 3db18a3ab..c89bff9b0 100644
--- a/src/components/AppNavigation/ListItemCalendar.vue
+++ b/src/components/AppNavigation/ListItemCalendar.vue
@@ -139,15 +139,7 @@ import ShareCalendar from './CalendarShare.vue'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import { generateRemoteUrl } from '@nextcloud/router'
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
-import NcAppNavigationIconBullet from '@nextcloud/vue/dist/Components/NcAppNavigationIconBullet.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcAvatar, NcAppNavigationItem, NcCounterBubble, NcAppNavigationIconBullet, NcActions, NcActionButton, NcActionLink, NcTextField, Tooltip } from '@nextcloud/vue'
 
 import Close from 'vue-material-design-icons/Close.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
diff --git a/src/components/AppNavigation/Trashbin.vue b/src/components/AppNavigation/Trashbin.vue
index 7346c61c5..409d2493c 100644
--- a/src/components/AppNavigation/Trashbin.vue
+++ b/src/components/AppNavigation/Trashbin.vue
@@ -113,12 +113,7 @@ import logger from '../../utils/logger.js'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import { NcAppNavigationItem, NcActions, NcActionButton, NcButton, NcEmptyContent, NcModal } from '@nextcloud/vue'
 
 import Delete from 'vue-material-design-icons/Delete.vue'
 import DeleteForever from 'vue-material-design-icons/DeleteForever.vue'
diff --git a/src/components/AppSidebar/CalendarPickerItem.vue b/src/components/AppSidebar/CalendarPickerItem.vue
index 711c328dd..099833ee6 100644
--- a/src/components/AppSidebar/CalendarPickerItem.vue
+++ b/src/components/AppSidebar/CalendarPickerItem.vue
@@ -51,7 +51,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 import CalendarPickerOption from './CalendarPickerOption.vue'
 
 import { translate as t } from '@nextcloud/l10n'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import { NcMultiselect } from '@nextcloud/vue'
 
 export default {
 	components: {
diff --git a/src/components/AppSidebar/CalendarPickerOption.vue b/src/components/AppSidebar/CalendarPickerOption.vue
index 0fdbde9ec..506293df5 100644
--- a/src/components/AppSidebar/CalendarPickerOption.vue
+++ b/src/components/AppSidebar/CalendarPickerOption.vue
@@ -42,7 +42,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+import { NcAvatar } from '@nextcloud/vue'
+
 export default {
 	name: 'CalendarPickerOption',
 	components: {
diff --git a/src/components/AppSidebar/DatetimePickerItem.vue b/src/components/AppSidebar/DatetimePickerItem.vue
index 8b5a0b0aa..5668d9ff7 100644
--- a/src/components/AppSidebar/DatetimePickerItem.vue
+++ b/src/components/AppSidebar/DatetimePickerItem.vue
@@ -85,7 +85,7 @@ import { overdue } from '../../store/storeHelper.js'
 
 import { translate as t } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import NcDatetimePicker from '@nextcloud/vue/dist/Components/NcDatetimePicker.js'
+import { NcDatetimePicker } from '@nextcloud/vue'
 
 export default {
 	name: 'DatetimePickerItem',
diff --git a/src/components/AppSidebar/MultiselectItem.vue b/src/components/AppSidebar/MultiselectItem.vue
index 358478763..b235213b6 100644
--- a/src/components/AppSidebar/MultiselectItem.vue
+++ b/src/components/AppSidebar/MultiselectItem.vue
@@ -53,7 +53,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import MultiselectOption from './MultiselectOption.vue'
 
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import { NcMultiselect } from '@nextcloud/vue'
 
 export default {
 	components: {
diff --git a/src/components/AppSidebar/TagsItem.vue b/src/components/AppSidebar/TagsItem.vue
index 18251fa94..88af7f6c3 100644
--- a/src/components/AppSidebar/TagsItem.vue
+++ b/src/components/AppSidebar/TagsItem.vue
@@ -53,7 +53,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 import MultiselectOption from './MultiselectOption.vue'
 
 import { translate as t } from '@nextcloud/l10n'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import { NcMultiselect } from '@nextcloud/vue'
 
 import Tag from 'vue-material-design-icons/Tag.vue'
 
diff --git a/src/components/DeleteCompletedModal.vue b/src/components/DeleteCompletedModal.vue
index 615b39a19..d53379cfd 100644
--- a/src/components/DeleteCompletedModal.vue
+++ b/src/components/DeleteCompletedModal.vue
@@ -72,9 +72,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcButton, NcModal, Tooltip } from '@nextcloud/vue'
 
 import Delete from 'vue-material-design-icons/Delete.vue'
 
diff --git a/src/components/LoadCompletedButton.vue b/src/components/LoadCompletedButton.vue
index d2f40be0b..1fbc57397 100644
--- a/src/components/LoadCompletedButton.vue
+++ b/src/components/LoadCompletedButton.vue
@@ -33,7 +33,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { translate as t } from '@nextcloud/l10n'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { NcButton } from '@nextcloud/vue'
 
 import CloudDownload from 'vue-material-design-icons/CloudDownload.vue'
 
diff --git a/src/components/SortorderDropdown.vue b/src/components/SortorderDropdown.vue
index 686f8dd6a..82bc24613 100644
--- a/src/components/SortorderDropdown.vue
+++ b/src/components/SortorderDropdown.vue
@@ -62,9 +62,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { translate as t } from '@nextcloud/l10n'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcActions, NcActionButton, Tooltip } from '@nextcloud/vue'
 
 import AnimationOutline from 'vue-material-design-icons/AnimationOutline.vue'
 import Bookmark from 'vue-material-design-icons/Bookmark.vue'
diff --git a/src/components/TaskBody.vue b/src/components/TaskBody.vue
index 6aadc9962..4ed97c0ae 100644
--- a/src/components/TaskBody.vue
+++ b/src/components/TaskBody.vue
@@ -173,10 +173,7 @@ import Task from '../models/task.js'
 import { emit } from '@nextcloud/event-bus'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcProgressBar from '@nextcloud/vue/dist/Components/NcProgressBar.js'
-import Linkify from '@nextcloud/vue/dist/Directives/Linkify.js'
+import { NcActions, NcActionButton, NcProgressBar, Linkify } from '@nextcloud/vue'
 
 import Delete from 'vue-material-design-icons/Delete.vue'
 import Eye from 'vue-material-design-icons/Eye.vue'
diff --git a/src/components/TaskCreateDialog.vue b/src/components/TaskCreateDialog.vue
index 5c22c0d78..74d630b8b 100644
--- a/src/components/TaskCreateDialog.vue
+++ b/src/components/TaskCreateDialog.vue
@@ -95,10 +95,7 @@ import client from '../services/cdav.js'
 
 import { translate as t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
-import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import { NcButton, NcEmptyContent, NcLoadingIcon, NcModal } from '@nextcloud/vue'
 
 import Check from 'vue-material-design-icons/Check.vue'
 import TextBoxOutline from 'vue-material-design-icons/TextBoxOutline.vue'
diff --git a/src/components/TaskStatusDisplay.vue b/src/components/TaskStatusDisplay.vue
index e654fc1de..61a61721d 100644
--- a/src/components/TaskStatusDisplay.vue
+++ b/src/components/TaskStatusDisplay.vue
@@ -34,8 +34,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcActions, NcActionButton } from '@nextcloud/vue'
 
 import AlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
 import Check from 'vue-material-design-icons/Check.vue'
diff --git a/src/mixins/editableItem.js b/src/mixins/editableItem.js
index a7a056559..ba8e67f16 100644
--- a/src/mixins/editableItem.js
+++ b/src/mixins/editableItem.js
@@ -21,8 +21,7 @@
  */
 import Task from '../models/task.js'
 
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import { NcActions, NcActionButton } from '@nextcloud/vue'
 
 import Check from 'vue-material-design-icons/Check.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
diff --git a/src/views/AppNavigation.vue b/src/views/AppNavigation.vue
index a981da6c5..0388cb6d2 100644
--- a/src/views/AppNavigation.vue
+++ b/src/views/AppNavigation.vue
@@ -101,11 +101,7 @@ import AppNavigationSettings from '../components/AppNavigation/AppNavigationSett
 import Trashbin from '../components/AppNavigation/Trashbin.vue'
 
 import { translate as t } from '@nextcloud/l10n'
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { NcAppNavigation, NcAppNavigationItem, NcCounterBubble, NcTextField, Tooltip } from '@nextcloud/vue'
 
 import CalendarToday from 'vue-material-design-icons/CalendarToday.vue'
 import CalendarWeek from 'vue-material-design-icons/CalendarWeek.vue'
diff --git a/src/views/AppSidebar.vue b/src/views/AppSidebar.vue
index 0f3809f4c..1391bc8c7 100644
--- a/src/views/AppSidebar.vue
+++ b/src/views/AppSidebar.vue
@@ -244,11 +244,7 @@ import Task from '../models/task.js'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
-import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
-import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
+import { NcActionButton, NcActionLink, NcEmptyContent, NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 
 import Calendar from 'vue-material-design-icons/Calendar.vue'
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index d3104ebce..fd684ac41 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -75,10 +75,7 @@ import { sort, isTaskInList } from '../store/storeHelper.js'
 
 import { translate as t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcDashboardWidget from '@nextcloud/vue/dist/Components/NcDashboardWidget.js'
-import NcDashboardWidgetItem from '@nextcloud/vue/dist/Components/NcDashboardWidgetItem.js'
+import { NcActionButton, NcButton, NcDashboardWidget, NcDashboardWidgetItem } from '@nextcloud/vue'
 
 import Check from 'vue-material-design-icons/Check.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'