Merge pull request #1694 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.10.0

Bump nextcloud-vue from 0.9.7 to 0.10.0

5 files changed, 28 insertions, 24 deletions

diff --git a/src/components/FolderContent.vue b/src/components/FolderContent.vue
index 68cb2b00c..c6459728b 100644
--- a/src/components/FolderContent.vue
+++ b/src/components/FolderContent.vue
@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<AppContent>
 		<AppDetailsToggle v-if="showMessage" @close="hideMessage" />
 		<div id="app-content-wrapper">
 			<Loading v-if="loading" :hint="t('mail', 'Loading messages')" />
@@ -16,11 +16,12 @@
 				<NoMessageSelected v-else-if="hasMessages" :mailbox="folder.name" />
 			</template>
 		</div>
-	</div>
+	</AppContent>
 </template>
 
 <script>
 import _ from 'lodash'
+import {AppContent} from 'nextcloud-vue/dist/Components/AppContent'
 import isMobile from 'nextcloud-vue/dist/Mixins/isMobile'
 
 import AppDetailsToggle from './AppDetailsToggle'
@@ -33,6 +34,7 @@ import NoMessageSelected from './NoMessageSelected'
 export default {
 	name: 'FolderContent',
 	components: {
+		AppContent,
 		AppDetailsToggle,
 		EnvelopeList,
 		Loading,
diff --git a/src/views/AccountSettings.vue b/src/views/AccountSettings.vue
index 56157c2c6..df076afb4 100644
--- a/src/views/AccountSettings.vue
+++ b/src/views/AccountSettings.vue
@@ -1,7 +1,7 @@
 <template>
-	<AppContent app-name="mail">
-		<Navigation slot="navigation" />
-		<template slot="content">
+	<Content app-name="mail">
+		<Navigation />
+		<AppContent>
 			<div class="section">
 				<h2>{{ t('mail', 'Account Settings') }} - {{ email }}</h2>
 				<h3>{{ t('mail', 'Mail server') }}</h3>
@@ -10,12 +10,12 @@
 				</div>
 				<SignatureSettings :account="account" />
 			</div>
-		</template>
-	</AppContent>
+		</AppContent>
+	</Content>
 </template>
 
 <script>
-import {AppContent} from 'nextcloud-vue'
+import {AppContent, Content} from 'nextcloud-vue'
 
 import AccountForm from '../components/AccountForm'
 import Navigation from '../components/Navigation'
@@ -26,6 +26,7 @@ export default {
 	components: {
 		AccountForm,
 		AppContent,
+		Content,
 		Navigation,
 		SignatureSettings,
 	},
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e987878bc..11c9f8bb9 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,12 +1,12 @@
 <template>
-	<AppContent v-shortkey.once="['c']" app-name="mail" @shortkey.native="onNewMessage">
-		<Navigation slot="navigation" />
-		<FolderContent v-if="activeAccount" slot="content" :account="activeAccount" :folder="activeFolder" />
-	</AppContent>
+	<Content v-shortkey.once="['c']" app-name="mail" @shortkey.native="onNewMessage">
+		<Navigation />
+		<FolderContent v-if="activeAccount" :account="activeAccount" :folder="activeFolder" />
+	</Content>
 </template>
 
 <script>
-import {AppContent} from 'nextcloud-vue'
+import {Content} from 'nextcloud-vue'
 
 import Navigation from '../components/Navigation'
 import FolderContent from '../components/FolderContent'
@@ -14,7 +14,7 @@ import FolderContent from '../components/FolderContent'
 export default {
 	name: 'Home',
 	components: {
-		AppContent,
+		Content,
 		FolderContent,
 		Navigation,
 	},
diff --git a/src/views/KeyboardShortcuts.vue b/src/views/KeyboardShortcuts.vue
index 1219a91c1..79f5961d3 100644
--- a/src/views/KeyboardShortcuts.vue
+++ b/src/views/KeyboardShortcuts.vue
@@ -1,7 +1,7 @@
 <template>
-	<AppContent app-name="mail">
-		<Navigation slot="navigation" />
-		<template slot="content">
+	<Content app-name="mail">
+		<Navigation />
+		<AppContent>
 			<div class="app-content-details">
 				<h2>{{ t('mail', 'Keyboard shortcuts') }}</h2>
 
@@ -48,12 +48,12 @@
 					</div>
 				</dl>
 			</div>
-		</template>
-	</AppContent>
+		</AppContent>
+	</Content>
 </template>
 
 <script>
-import {AppContent} from 'nextcloud-vue'
+import {AppContent, Content} from 'nextcloud-vue'
 
 import Navigation from '../components/Navigation'
 
@@ -61,6 +61,7 @@ export default {
 	name: 'KeyboardShortcuts',
 	components: {
 		AppContent,
+		Content,
 		Navigation,
 	},
 }
diff --git a/src/views/Setup.vue b/src/views/Setup.vue
index 234603d50..4b3ae6d47 100644
--- a/src/views/Setup.vue
+++ b/src/views/Setup.vue
@@ -1,22 +1,22 @@
 <template>
-	<AppContent app-name="mail">
+	<Content app-name="mail">
 		<div id="emptycontent">
 			<div class="icon-mail"></div>
 			<h2>{{ t('mail', 'Connect your mail account') }}</h2>
 			<AccountForm :display-name="displayName" :email="email" :save="onSave" />
 		</div>
-	</AppContent>
+	</Content>
 </template>
 
 <script>
-import {AppContent} from 'nextcloud-vue'
+import {Content} from 'nextcloud-vue'
 import AccountForm from '../components/AccountForm'
 
 export default {
 	name: 'Setup',
 	components: {
 		AccountForm,
-		AppContent,
+		Content,
 	},
 	computed: {
 		displayName() {