diff options
author | greta <gretadoci@gmail.com> | 2022-09-09 11:15:47 +0200 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-09-16 17:14:42 +0200 |
commit | 54a990db59dfcd1c89499e08d763cf4a8803cd3a (patch) | |
tree | fc5ca0bc343bcf976465ed79db0ee703d0421883 /src/components/AppContent | |
parent | bcd28ac14ae5a4061fb9525af42aa6d34811ee59 (diff) |
Bump @nextcloud/vue v7.0.0-beta.1
Signed-off-by: greta <gretadoci@gmail.com>
Diffstat (limited to 'src/components/AppContent')
-rw-r--r-- | src/components/AppContent/CircleContent.vue | 24 | ||||
-rw-r--r-- | src/components/AppContent/ContactsContent.vue | 20 |
2 files changed, 25 insertions, 19 deletions
diff --git a/src/components/AppContent/CircleContent.vue b/src/components/AppContent/CircleContent.vue index 3cfdcbc0..90619e90 100644 --- a/src/components/AppContent/CircleContent.vue +++ b/src/components/AppContent/CircleContent.vue @@ -22,18 +22,19 @@ <template> <AppContent v-if="!circle"> - <EmptyContent> + <EmptyContent :title="t('contacts', 'Please select a circle')"> <template #icon> <IconCircles :size="20" /> </template> - {{ t('contacts', 'Please select a circle') }} </EmptyContent> </AppContent> <AppContent v-else-if="loading"> - <EmptyContent icon="icon-loading"> - {{ t('contacts', 'Loading circle …') }} + <EmptyContent :title="t('contacts', 'Loading circle …')"> + <template #icon> + <IconLoading :size="20" /> + </template> </EmptyContent> </AppContent> @@ -51,16 +52,17 @@ <!-- not a member --> <template v-if="!circle.isMember"> <!-- Pending request validation --> - <EmptyContent v-if="circle.isPendingMember" icon="icon-loading"> - {{ t('contacts', 'Your request to join this circle is pending approval') }} + <EmptyContent v-if="circle.isPendingMember" :title="t('contacts', 'Your request to join this circle is pending approval')"> + <template #icon> + <IconLoading :size="20" /> + </template> </EmptyContent> - <EmptyContent v-else> + <EmptyContent v-else :title="t('contacts', 'You are not a member of {circle}', { circle: circle.displayName})"> <template #icon> <IconCircles :size="20" /> </template> - {{ t('contacts', 'You are not a member of {circle}', { circle: circle.displayName}) }} </EmptyContent> </template> </CircleDetails> @@ -68,8 +70,9 @@ </template> <script> import { showError } from '@nextcloud/dialogs' -import AppContent from '@nextcloud/vue/dist/Components/AppContent' -import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent' +import AppContent from '@nextcloud/vue/dist/Components/NcAppContent' +import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent' +import IconLoading from '@nextcloud/vue/dist/Components/NcLoadingIcon' import isMobile from '@nextcloud/vue/dist/Mixins/isMobile' import IconCircles from '../Icons/IconCircles' import CircleDetails from '../CircleDetails' @@ -85,6 +88,7 @@ export default { EmptyContent, MemberList, IconCircles, + IconLoading, }, mixins: [isMobile, RouterMixin], diff --git a/src/components/AppContent/ContactsContent.vue b/src/components/AppContent/ContactsContent.vue index a5dceb2c..9f5b2c1a 100644 --- a/src/components/AppContent/ContactsContent.vue +++ b/src/components/AppContent/ContactsContent.vue @@ -22,18 +22,19 @@ <template> <AppContent v-if="loading"> - <EmptyContent icon="icon-loading"> - {{ t('contacts', 'Loading contacts …') }} + <EmptyContent :title="t('contacts', 'Loading contacts …')"> + <template #icon> + <IconLoading :size="20" /> + </template> </EmptyContent> </AppContent> <AppContent v-else-if="isEmptyGroup && !isRealGroup"> - <EmptyContent> + <EmptyContent :title="t('contacts', 'There are no contacts yet')"> <template #icon> <IconContact :size="20" /> </template> - {{ t('contacts', 'There are no contacts yet') }} <template #desc> <Button type="primary" @click="newContact"> {{ t('contacts', 'Create contact') }} @@ -43,12 +44,11 @@ </AppContent> <AppContent v-else-if="isEmptyGroup && isRealGroup"> - <EmptyContent> + <EmptyContent :title=" t('contacts', 'There are no contacts in this group')"> <template #icon> <IconContact :size="20" /> </template> - {{ t('contacts', 'There are no contacts in this group') }} <template #desc> <Button v-if="contacts.length === 0" type="primary" @click="addContactsToGroup(selectedGroup)"> {{ t('contacts', 'Create contacts') }} @@ -75,9 +75,10 @@ </template> <script> import { emit } from '@nextcloud/event-bus' -import AppContent from '@nextcloud/vue/dist/Components/AppContent' -import Button from '@nextcloud/vue/dist/Components/Button' -import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent' +import AppContent from '@nextcloud/vue/dist/Components/NcAppContent' +import Button from '@nextcloud/vue/dist/Components/NcButton' +import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent' +import IconLoading from '@nextcloud/vue/dist/Components/NcLoadingIcon' import ContactDetails from '../ContactDetails' import ContactsList from '../ContactsList' @@ -94,6 +95,7 @@ export default { ContactsList, EmptyContent, IconContact, + IconLoading, }, mixins: [RouterMixin], |