From 708018795863999b674d1e3e900313785893d6a8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Thu, 11 Aug 2022 14:33:34 +0200
Subject: Bump @nextcloud/vue to 6.0.0-beta.3 and related

Update @nextcloud/vue to 6.0.0-beta.3
Update vue and vue-template-compiler to 2.7.8
Update calendar-availability-vue to 0.5.0-beta.1 to fix conflicts.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 apps/settings/src/components/AdminTwoFactor.vue              |  8 ++++----
 apps/settings/src/components/AppList.vue                     |  8 ++++----
 apps/settings/src/components/AuthTokenSetupDialogue.vue      | 12 ++++++------
 apps/settings/src/components/Encryption.vue                  |  8 ++++----
 .../src/components/PersonalInfo/shared/HeaderBar.vue         |  8 ++++----
 apps/settings/src/components/UserList.vue                    |  8 ++++----
 6 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'apps/settings/src/components')

diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
index 435348f30ab..a5c61b3b0f8 100644
--- a/apps/settings/src/components/AdminTwoFactor.vue
+++ b/apps/settings/src/components/AdminTwoFactor.vue
@@ -53,12 +53,12 @@
 			</p>
 		</template>
 		<p class="top-margin">
-			<Button v-if="dirty"
+			<ButtonVue v-if="dirty"
 				type="primary"
 				:disabled="loading"
 				@click="saveChanges">
 				{{ t('settings', 'Save changes') }}
-			</Button>
+			</ButtonVue>
 		</p>
 	</SettingsSection>
 </template>
@@ -66,7 +66,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
 import { loadState } from '@nextcloud/initial-state'
@@ -78,7 +78,7 @@ export default {
 	name: 'AdminTwoFactor',
 	components: {
 		Multiselect,
-		Button,
+		ButtonVue,
 		CheckboxRadioSwitch,
 		SettingsSection,
 	},
diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 3a0c1fe51d0..2c62e4e0d36 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -26,12 +26,12 @@
 			<template v-if="useListView">
 				<div v-if="showUpdateAll" class="toolbar">
 					{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
-					<Button v-if="showUpdateAll"
+					<ButtonVue v-if="showUpdateAll"
 						id="app-list-update-all"
 						type="primary"
 						@click="updateAll">
 						{{ n('settings', 'Update', 'Update all', counter) }}
-					</Button>
+					</ButtonVue>
 				</div>
 
 				<div v-if="!showUpdateAll" class="toolbar">
@@ -107,13 +107,13 @@
 import AppItem from './AppList/AppItem'
 import PrefixMixin from './PrefixMixin'
 import pLimit from 'p-limit'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'AppList',
 	components: {
 		AppItem,
-		Button,
+		ButtonVue,
 	},
 	mixins: [PrefixMixin],
 	props: ['category', 'app', 'search'],
diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue
index 9a03d0971ac..3f3b1cf1fb3 100644
--- a/apps/settings/src/components/AuthTokenSetupDialogue.vue
+++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue
@@ -28,11 +28,11 @@
 			:disabled="loading"
 			:placeholder="t('settings', 'App name')"
 			@keydown.enter="submit">
-		<Button :disabled="loading || deviceName.length === 0"
+		<ButtonVue :disabled="loading || deviceName.length === 0"
 			type="primary"
 			@click="submit">
 			{{ t('settings', 'Create new app password') }}
-		</Button>
+		</ButtonVue>
 	</div>
 	<div v-else class="spacing">
 		{{ t('settings', 'Use the credentials below to configure your app or device.') }}
@@ -63,9 +63,9 @@
 				class="icon icon-clippy"
 				@mouseover="hoveringCopyButton = true"
 				@mouseleave="hoveringCopyButton = false" />
-			<Button @click="reset">
+			<ButtonVue @click="reset">
 				{{ t('settings', 'Done') }}
-			</Button>
+			</ButtonVue>
 		</div>
 		<div class="app-password-row">
 			<span class="app-password-label" />
@@ -83,13 +83,13 @@
 import QR from '@chenfengyuan/vue-qrcode'
 import confirmPassword from '@nextcloud/password-confirmation'
 import { getRootUrl } from '@nextcloud/router'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 
 export default {
 	name: 'AuthTokenSetupDialogue',
 	components: {
 		QR,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		add: {
diff --git a/apps/settings/src/components/Encryption.vue b/apps/settings/src/components/Encryption.vue
index aef44164e2f..d75225d1a18 100644
--- a/apps/settings/src/components/Encryption.vue
+++ b/apps/settings/src/components/Encryption.vue
@@ -43,10 +43,10 @@
 			<p class="margin-bottom">
 				{{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }}
 			</p>
-			<Button type="primary"
+			<ButtonVue type="primary"
 				@click="enableEncryption()">
 				{{ t('settings', "Enable encryption") }}
-			</Button>
+			</ButtonVue>
 		</div>
 
 		<div v-if="encryptionEnabled">
@@ -78,7 +78,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
 import { loadState } from '@nextcloud/initial-state'
 import { getLoggerBuilder } from '@nextcloud/logger'
@@ -97,7 +97,7 @@ export default {
 	components: {
 		CheckboxRadioSwitch,
 		SettingsSection,
-		Button,
+		ButtonVue,
 	},
 	data() {
 		const encryptionModules = loadState('settings', 'encryption-modules')
diff --git a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
index 65eb5a110a3..59fdaa6c802 100644
--- a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
@@ -35,7 +35,7 @@
 		</template>
 
 		<template v-if="isEditable && isMultiValueSupported">
-			<Button type="tertiary"
+			<ButtonVue type="tertiary"
 				:disabled="!isValidSection"
 				:aria-label="t('settings', 'Add additional email')"
 				@click.stop.prevent="onAddAdditional">
@@ -43,14 +43,14 @@
 					<Plus :size="20" />
 				</template>
 				{{ t('settings', 'Add') }}
-			</Button>
+			</ButtonVue>
 		</template>
 	</h3>
 </template>
 
 <script>
 import FederationControl from './FederationControl'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Plus from 'vue-material-design-icons/Plus'
 import { ACCOUNT_PROPERTY_READABLE_ENUM, ACCOUNT_SETTING_PROPERTY_READABLE_ENUM, PROFILE_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
 
@@ -59,7 +59,7 @@ export default {
 
 	components: {
 		FederationControl,
-		Button,
+		ButtonVue,
 		Plus,
 	},
 
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 4d50da62596..12ef853a9b0 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -142,12 +142,12 @@
 				<div v-if="showConfig.showUserBackend" class="userBackend" />
 				<div v-if="showConfig.showLastLogin" class="lastLogin" />
 				<div class="user-actions">
-					<Button id="newsubmit"
+					<ButtonVue id="newsubmit"
 						type="primary"
 						native-type="submit"
 						value="">
 						{{ t('settings', 'Add a new user') }}
-					</Button>
+					</ButtonVue>
 				</div>
 			</form>
 		</Modal>
@@ -235,7 +235,7 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import InfiniteLoading from 'vue-infinite-loading'
 import Vue from 'vue'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 
 import userRow from './UserList/UserRow'
@@ -269,7 +269,7 @@ export default {
 		userRow,
 		Multiselect,
 		InfiniteLoading,
-		Button,
+		ButtonVue,
 	},
 	props: {
 		users: {
-- 
cgit v1.2.3