Merge pull request #7841 from nextcloud/dependabot/npm_and_yarn/nextcloud/vue-6.0.0-beta.5

Bump @nextcloud/vue from 6.0.0-beta.4 to 6.0.0-beta.5

5 files changed, 46 insertions, 36 deletions

diff --git a/package-lock.json b/package-lock.json
index b56eb91e7..e0abfbc0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
 				"@nextcloud/moment": "^1.2.1",
 				"@nextcloud/paths": "^2.1.0",
 				"@nextcloud/router": "^2.0.0",
-				"@nextcloud/vue": "^6.0.0-beta.4",
+				"@nextcloud/vue": "^6.0.0-beta.5",
 				"@nextcloud/vue-dashboard": "^2.0.1",
 				"@nextcloud/vue-richtext": "^2.0.0",
 				"attachmediastream": "^2.1.0",
@@ -2749,9 +2749,9 @@
 			}
 		},
 		"node_modules/@nextcloud/vue": {
-			"version": "6.0.0-beta.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.4.tgz",
-			"integrity": "sha512-1TdzH0++/gIcBzot8iNT3AnweR/1EykpCfBwkJNhMgoiY4HlMLxBj7bpe2D4ul24XTCoXVEdGMYyB32GNVc9WA==",
+			"version": "6.0.0-beta.5",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.5.tgz",
+			"integrity": "sha512-23vdV3Z9iyUXs5mGi++uGShpL1+lhNPLfjbnCjf9rIytG6XQV/46vzdBSttbBA91CnuEYufEsTu3grjwW9JiRg==",
 			"dependencies": {
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
@@ -2760,6 +2760,7 @@
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^3.1.4",
 				"@nextcloud/event-bus": "^3.0.0",
+				"@nextcloud/initial-state": "^1.2.1",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/logger": "^2.2.1",
 				"@nextcloud/router": "^2.0.0",
@@ -28233,9 +28234,9 @@
 			}
 		},
 		"@nextcloud/vue": {
-			"version": "6.0.0-beta.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.4.tgz",
-			"integrity": "sha512-1TdzH0++/gIcBzot8iNT3AnweR/1EykpCfBwkJNhMgoiY4HlMLxBj7bpe2D4ul24XTCoXVEdGMYyB32GNVc9WA==",
+			"version": "6.0.0-beta.5",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.5.tgz",
+			"integrity": "sha512-23vdV3Z9iyUXs5mGi++uGShpL1+lhNPLfjbnCjf9rIytG6XQV/46vzdBSttbBA91CnuEYufEsTu3grjwW9JiRg==",
 			"requires": {
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
@@ -28244,6 +28245,7 @@
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^3.1.4",
 				"@nextcloud/event-bus": "^3.0.0",
+				"@nextcloud/initial-state": "^1.2.1",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/logger": "^2.2.1",
 				"@nextcloud/router": "^2.0.0",
diff --git a/package.json b/package.json
index 9810becd2..af163ebc1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 		"@nextcloud/moment": "^1.2.1",
 		"@nextcloud/paths": "^2.1.0",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^6.0.0-beta.4",
+		"@nextcloud/vue": "^6.0.0-beta.5",
 		"@nextcloud/vue-dashboard": "^2.0.1",
 		"@nextcloud/vue-richtext": "^2.0.0",
 		"attachmediastream": "^2.1.0",
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
index 55c0be86c..ca5dc99b6 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
@@ -21,6 +21,19 @@
 
 <template>
 	<div class="forwarder">
+		<NcEmptyContent :description="t('spreed', 'The message has been forwarded to {selectedConversationName}')">
+			<template #icon>
+				<Check :size="64" />
+			</template>
+			<template #action>
+				<NcButton type="tertiary" @click="handleClose">
+					{{ t('spreed', 'Dismiss') }}
+				</NcButton>
+				<NcButton type="primary" @click="openConversation">
+					{{ t('spreed', 'Go to conversation') }}
+				</NcButton>
+			</template>
+		</NcEmptyContent>
 		<!-- First step of the flow: selection of the room to which forward the
 		message to -->
 		<RoomSelector v-if="!showForwardedConfirmation"
@@ -32,25 +45,23 @@
 			@close="handleClose" />
 
 		<!-- Second step of the flow: confirmation modal that gives the user
-		the possibility to direclty route to the conversation to which the
+		the possibility to directly route to the conversation to which the
 		message has been forwarded -->
 		<NcModal v-else
 			@close="handleClose">
-			<div class="forwarder">
-				<NcEmptyContent icon="icon-checkmark" class="forwarded-confirmation__emptycontent">
-					<template #desc>
-						{{ t('spreed', 'The message has been forwarded to {selectedConversationName}', { selectedConversationName }) }}
-					</template>
-				</NcEmptyContent>
-				<div class="forwarded-confirmation__navigation">
+			<NcEmptyContent :description="t('spreed', 'The message has been forwarded to {selectedConversationName}', { selectedConversationName })">
+				<template #icon>
+					<Check :size="64" />
+				</template>
+				<template #action>
 					<NcButton type="tertiary" @click="handleClose">
 						{{ t('spreed', 'Dismiss') }}
 					</NcButton>
 					<NcButton type="primary" @click="openConversation">
 						{{ t('spreed', 'Go to conversation') }}
 					</NcButton>
-				</div>
-			</div>
+				</template>
+			</NcEmptyContent>
 		</NcModal>
 	</div>
 </template>
@@ -62,6 +73,7 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import { showError } from '@nextcloud/dialogs'
 import cloneDeep from 'lodash/cloneDeep.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import Check from 'vue-material-design-icons/Check.vue'
 
 export default {
 	name: 'Forwarder',
@@ -71,6 +83,7 @@ export default {
 		NcEmptyContent,
 		NcModal,
 		NcButton,
+		Check,
 	},
 
 	props: {
@@ -196,18 +209,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.forwarded-confirmation {
-	&__emptycontent {
-		width: 100%;
-		text-align: center;
-		margin-top: 15vh !important;
-	}
-	&__navigation {
-		display: flex;
-		justify-content: space-between;
-		padding: 12px;
-	}
-}
 
 .forwarder {
 	padding: 20px;
diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
index fd6b64068..0ba4bcfe8 100644
--- a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -47,12 +47,11 @@
 				:name="conversation.displayName"
 				:is-active="active" />
 		</template>
-		<NcEmptyContent v-else-if="!hasSharedItems">
+		<NcEmptyContent v-else-if="!hasSharedItems"
+			:title="t('spreed', 'No shared items')">
 			<template #icon>
 				<FolderMultipleImage :size="20" />
 			</template>
-
-			{{ t('spreed', 'No shared items') }}
 		</NcEmptyContent>
 		<SharedItemsBrowser v-if="showSharedItemsBrowser"
 			:shared-items="sharedItems"
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index a9d9a0cf0..9b1d25783 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -41,9 +41,11 @@
 			</DashboardWidgetItem>
 		</template>
 		<template #empty-content>
-			<NcEmptyContent icon="icon-talk">
-				<template #desc>
-					{{ t('spreed', 'Say hi to your friends and colleagues!') }}
+			<NcEmptyContent :description="t('spreed', 'Say hi to your friends and colleagues!')">
+				<template #icon>
+					<span class="icon icon-talk" />
+				</template>
+				<template #action>
 					<NcButton class="button-start-conversation"
 						type="secondary"
 						@click="clickStartNew">
@@ -220,6 +222,12 @@ export default {
 		text-align: center;
 		margin-top: 5vh;
 
+		.icon-talk {
+			width: 64px;
+			height: 64px;
+			background-size: 64px;
+		}
+
 		&.half-screen {
 			margin-top: 0;
 			margin-bottom: 2vh;