Fix @nextcloud/vue imports

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Jan 14, 2021 · 750d593 · 750d593
1 parent b9287f9
commit 750d593
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
@@ -90,7 +90,7 @@
 import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import { getCurrentUser } from '@nextcloud/auth'
-import { Modal } from '@nextcloud/vue'
+import Modal from '@nextcloud/vue/dist/Components/Modal'
 import Draggable from 'vuedraggable'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
@@ -166,7 +166,7 @@ export default {
 
 			// Determine part of the day
 			let partOfDay
-			if (time >= 22 || time < 5) {
+			if (time >= 22 && time < 5) {
 				partOfDay = 'night'
 			} else if (time >= 18) {
 				partOfDay = 'evening'

diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
@@ -67,7 +67,7 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import { Multiselect } from '@nextcloud/vue'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import _ from 'lodash'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 

diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { Multiselect } from '@nextcloud/vue'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 
 import AppManagement from '../mixins/AppManagement'
 import PrefixMixin from './PrefixMixin'

diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -84,7 +84,9 @@
 </template>
 
 <script>
-import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ClickOutside from 'vue-click-outside'
 import { getCurrentUser } from '@nextcloud/auth'
 import UserRowMixin from '../../mixins/UserRowMixin'

diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue
@@ -110,7 +110,8 @@
 
 <script>
 import { generateUrl, getRootUrl, generateOcsUrl } from '@nextcloud/router'
-import { PopoverMenu, Multiselect } from '@nextcloud/vue'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import { VTooltip } from 'v-tooltip'
 import ClickOutside from 'vue-click-outside'